From owner-p4-projects@FreeBSD.ORG Sun Jan 21 00:01:09 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FA9516A407; Sun, 21 Jan 2007 00:01:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2BDA016A400 for ; Sun, 21 Jan 2007 00:01:09 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 19E5C13C442 for ; Sun, 21 Jan 2007 00:01:09 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0L018p6048230 for ; Sun, 21 Jan 2007 00:01:09 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0L018Ho048217 for perforce@freebsd.org; Sun, 21 Jan 2007 00:01:08 GMT (envelope-from sam@freebsd.org) Date: Sun, 21 Jan 2007 00:01:08 GMT Message-Id: <200701210001.l0L018Ho048217@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 113229 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 00:01:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=113229 Change 113229 by sam@sam_ebb on 2007/01/21 00:01:05 IFC @ 113228 Affected files ... .. //depot/projects/wifi/sys/net80211/_ieee80211.h#13 integrate .. //depot/projects/wifi/sys/net80211/ieee80211.c#37 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#23 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#21 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#78 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#76 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#46 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#28 integrate .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#44 integrate Differences ... ==== //depot/projects/wifi/sys/net80211/_ieee80211.h#13 (text+ko) ==== @@ -29,7 +29,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/net80211/_ieee80211.h,v 1.5 2006/12/27 18:46:18 sam Exp $ + * $FreeBSD: src/sys/net80211/_ieee80211.h,v 1.6 2007/01/15 01:12:28 sam Exp $ */ #ifndef _NET80211__IEEE80211_H_ #define _NET80211__IEEE80211_H_ @@ -129,6 +129,7 @@ #define IEEE80211_CHAN_PASSIVE 0x0200 /* Only passive scan allowed */ #define IEEE80211_CHAN_DYN 0x0400 /* Dynamic CCK-OFDM channel */ #define IEEE80211_CHAN_GFSK 0x0800 /* GFSK channel (FHSS PHY) */ +#define IEEE80211_CHAN_GSM 0x1000 /* 900 MHz spectrum channel */ #define IEEE80211_CHAN_STURBO 0x2000 /* 11a static turbo channel only */ #define IEEE80211_CHAN_HALF 0x4000 /* Half rate channel */ #define IEEE80211_CHAN_QUARTER 0x8000 /* Quarter rate channel */ @@ -199,6 +200,10 @@ (((_c)->ic_flags & IEEE80211_CHAN_HALF) != 0) #define IEEE80211_IS_CHAN_QUARTER(_c) \ (((_c)->ic_flags & IEEE80211_CHAN_QUARTER) != 0) +#define IEEE80211_IS_CHAN_FULL(_c) \ + (((_c)->ic_flags & (IEEE80211_CHAN_QUARTER | IEEE80211_CHAN_HALF)) == 0) +#define IEEE80211_IS_CHAN_GSM(_c) \ + (((_c)->ic_flags & IEEE80211_CHAN_GSM) != 0) /* ni_chan encoding for FH phy */ #define IEEE80211_FH_CHANMOD 80 ==== //depot/projects/wifi/sys/net80211/ieee80211.c#37 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.33 2006/12/28 01:31:26 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.35 2007/01/15 01:12:28 sam Exp $"); /* * IEEE 802.11 generic handler @@ -274,6 +274,7 @@ ieee80211_sysctl_detach(ic); ieee80211_scan_detach(ic); + /* NB: must be called before ieee80211_node_detach */ ieee80211_proto_detach(ic); ieee80211_crypto_detach(ic); ieee80211_power_detach(ic); @@ -287,12 +288,34 @@ ether_ifdetach(ifp); } +static __inline int +mapgsm(u_int freq, u_int flags) +{ + freq *= 10; + if (flags & IEEE80211_CHAN_QUARTER) + freq += 5; + else if (flags & IEEE80211_CHAN_HALF) + freq += 10; + else + freq += 20; + /* NB: there is no 907/20 wide but leave room */ + return (freq - 906*10) / 5; +} + +static __inline int +mappsb(u_int freq, u_int flags) +{ + return 37 + ((freq * 10) + ((freq % 5) == 2 ? 5 : 0) - 49400) / 5; +} + /* * Convert MHz frequency to IEEE channel number. */ int ieee80211_mhz2ieee(u_int freq, u_int flags) { + if (flags & IEEE80211_CHAN_GSM) + return mapgsm(freq, flags); if (flags & IEEE80211_CHAN_2GHZ) { /* 2GHz band */ if (freq == 2484) return 14; @@ -303,20 +326,21 @@ } else if (flags & IEEE80211_CHAN_5GHZ) { /* 5Ghz band */ if (freq <= 5000) { if (flags &(IEEE80211_CHAN_HALF|IEEE80211_CHAN_QUARTER)) - return 37 + ((freq * 10) + - ((freq % 5) == 2 ? 5 : 0) - 49400) / 5; + return mappsb(freq, flags); return (freq - 4000) / 5; } else return (freq - 5000) / 5; } else { /* either, guess */ if (freq == 2484) return 14; - if (freq < 2484) + if (freq < 2484) { + if (907 <= freq && freq <= 922) + return mapgsm(freq, flags); return ((int) freq - 2407) / 5; + } if (freq < 5000) { if (flags &(IEEE80211_CHAN_HALF|IEEE80211_CHAN_QUARTER)) - return 37 + ((freq * 10) + - ((freq % 5) == 2 ? 5 : 0) - 49400) / 5; + return mappsb(freq, flags); else if (freq > 4900) return (freq - 4000) / 5; else @@ -345,6 +369,8 @@ u_int ieee80211_ieee2mhz(u_int chan, u_int flags) { + if (flags & IEEE80211_CHAN_GSM) + return 907 + 5 * (chan / 10); if (flags & IEEE80211_CHAN_2GHZ) { /* 2GHz band */ if (chan == 14) return 2484; @@ -359,13 +385,13 @@ } return 5000 + (chan*5); } else { /* either, guess */ + /* XXX can't distinguish PSB+GSM channels */ if (chan == 14) return 2484; if (chan < 14) /* 0-13 */ return 2407 + chan*5; if (chan < 27) /* 15-26 */ return 2512 + ((chan-15)*20); - /* XXX can't distinguish PSB channels */ return 5000 + (chan*5); } } @@ -523,12 +549,10 @@ { enum ieee80211_phymode mode = ieee80211_chan2mode(c); - if (mode == IEEE80211_MODE_11A) { - if (IEEE80211_IS_CHAN_HALF(c)) - return &ieee80211_rateset_half; - if (IEEE80211_IS_CHAN_QUARTER(c)) - return &ieee80211_rateset_quarter; - } + if (IEEE80211_IS_CHAN_HALF(c)) + return &ieee80211_rateset_half; + if (IEEE80211_IS_CHAN_QUARTER(c)) + return &ieee80211_rateset_quarter; return &ic->ic_sup_rates[mode]; } @@ -910,21 +934,13 @@ ieee80211_setmode(struct ieee80211com *ic, enum ieee80211_phymode mode) { /* - * Do mode-specific rate setup. + * Adjust basic rates in 11b/11g supported rate set. + * Note that if operating on a hal/quarter rate channel + * this is a noop as those rates sets are different + * and used instead. */ - if (mode == IEEE80211_MODE_11G) { - /* - * Use a mixed 11b/11g rate set. - */ - ieee80211_set11gbasicrates(&ic->ic_sup_rates[mode], - IEEE80211_MODE_11G); - } else if (mode == IEEE80211_MODE_11B) { - /* - * Force pure 11b rate set. - */ - ieee80211_set11gbasicrates(&ic->ic_sup_rates[mode], - IEEE80211_MODE_11B); - } + if (mode == IEEE80211_MODE_11G || mode == IEEE80211_MODE_11B) + ieee80211_set11gbasicrates(&ic->ic_sup_rates[mode], mode); ic->ic_curmode = mode; ieee80211_reset_erp(ic); /* reset ERP state */ ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#23 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_freebsd.c,v 1.12 2006/06/24 18:00:17 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_freebsd.c,v 1.13 2007/01/08 18:23:43 sam Exp $"); /* * IEEE 802.11 support (FreeBSD-specific code) @@ -150,6 +150,26 @@ return atomic_cmpset_int(&ni->ni_refcnt, 0, 1); } +void +ieee80211_drain_ifq(struct ifqueue *ifq) +{ + struct ieee80211_node *ni; + struct mbuf *m; + + for (;;) { + IF_DEQUEUE(ifq, m); + if (m == NULL) + break; + + ni = (struct ieee80211_node *)m->m_pkthdr.rcvif; + KASSERT(ni != NULL, ("frame w/o node")); + ieee80211_free_node(ni); + m->m_pkthdr.rcvif = NULL; + + m_freem(m); + } +} + /* * Allocate and setup a management frame of the specified * size. We return the mbuf and a pointer to the start ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#21 (text+ko) ==== @@ -24,11 +24,12 @@ * (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/net80211/ieee80211_freebsd.h,v 1.7 2006/07/26 03:15:15 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_freebsd.h,v 1.10 2007/01/09 04:37:05 sam Exp $ */ #ifndef _NET80211_IEEE80211_FREEBSD_H_ #define _NET80211_IEEE80211_FREEBSD_H_ +#ifdef _KERNEL /* * Common state locking definitions. */ @@ -160,6 +161,9 @@ int ieee80211_node_dectestref(struct ieee80211_node *ni); #define ieee80211_node_refcnt(_ni) (_ni)->ni_refcnt +struct ifqueue; +void ieee80211_drain_ifq(struct ifqueue *); + #define msecs_to_ticks(ms) ((ms)*1000/hz) #define time_after(a,b) ((long)(b) - (long)(a) < 0) #define time_before(a,b) time_after(b,a) @@ -215,6 +219,7 @@ void ieee80211_sysctl_detach(struct ieee80211com *); void ieee80211_load_module(const char *); +#endif /* _KERNEL */ /* XXX this stuff belongs elsewhere */ /* ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#78 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.97 2006/12/01 17:58:33 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_input.c,v 1.98 2007/01/08 17:24:51 sam Exp $"); #include #include @@ -2764,6 +2764,7 @@ IEEE80211_VERIFY_ELEMENT(rates, IEEE80211_RATE_MAXSIZE); rate = ieee80211_setup_rates(ni, rates, xrates, + IEEE80211_F_JOIN | IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE | IEEE80211_F_DONEGO | IEEE80211_F_DODEL); if (rate & IEEE80211_RATE_BASIC) { ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#76 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.76 2006/12/27 18:46:18 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.78 2007/01/15 01:12:28 sam Exp $"); #include #include @@ -320,16 +320,20 @@ /* * Do mode-specific rate setup. */ - if (IEEE80211_IS_CHAN_ANYG(chan)) { - /* - * Use a mixed 11b/11g rate set. - */ - ieee80211_set11gbasicrates(&ni->ni_rates, IEEE80211_MODE_11G); - } else if (IEEE80211_IS_CHAN_B(chan)) { - /* - * Force pure 11b rate set. - */ - ieee80211_set11gbasicrates(&ni->ni_rates, IEEE80211_MODE_11B); + if (IEEE80211_IS_CHAN_FULL(chan)) { + if (IEEE80211_IS_CHAN_ANYG(chan)) { + /* + * Use a mixed 11b/11g rate set. + */ + ieee80211_set11gbasicrates(&ni->ni_rates, + IEEE80211_MODE_11G); + } else if (IEEE80211_IS_CHAN_B(chan)) { + /* + * Force pure 11b rate set. + */ + ieee80211_set11gbasicrates(&ni->ni_rates, + IEEE80211_MODE_11B); + } } (void) ieee80211_sta_join1(ieee80211_ref_node(ni)); @@ -440,7 +444,8 @@ if (ni->ni_capinfo & IEEE80211_CAPINFO_PRIVACY) fail |= 0x04; } - rate = ieee80211_fix_rate(ni, IEEE80211_F_DONEGO | IEEE80211_F_DOFRATE); + rate = ieee80211_fix_rate(ni, + IEEE80211_F_JOIN | IEEE80211_F_DONEGO | IEEE80211_F_DOFRATE); if (rate & IEEE80211_RATE_BASIC) fail |= 0x08; if (ic->ic_des_nssid != 0 && @@ -534,11 +539,6 @@ if (ic->ic_opmode == IEEE80211_M_IBSS) { struct ieee80211_node_table *nt; /* - * Delete unusable rates; we've already checked - * that the negotiated rate set is acceptable. - */ - ieee80211_fix_rate(selbs, IEEE80211_F_DODEL); - /* * Fillin the neighbor table; it will already * exist if we are simply switching mastership. * XXX ic_sta always setup so this is unnecessary? @@ -565,6 +565,13 @@ copy_bss(selbs, obss); ieee80211_free_node(obss); } + + /* + * Delete unusable rates; we've already checked + * that the negotiated rate set is acceptable. + */ + ieee80211_fix_rate(ic->ic_bss, IEEE80211_F_DODEL | IEEE80211_F_JOIN); + ic->ic_bsschan = selbs->ni_chan; ic->ic_curchan = ic->ic_bsschan; ic->ic_curmode = ieee80211_chan2mode(ic->ic_curchan); @@ -987,7 +994,9 @@ ieee80211_saveath(ni, sp->ath); /* NB: must be after ni_chan is setup */ - ieee80211_setup_rates(ni, sp->rates, sp->xrates, IEEE80211_F_DOSORT); + ieee80211_setup_rates(ni, sp->rates, sp->xrates, + IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE | + IEEE80211_F_DONEGO | IEEE80211_F_DODEL); } /* @@ -1695,7 +1704,8 @@ IEEE80211_AID_SET(ni->ni_associd, ic->ic_aid_bitmap); ic->ic_sta_assoc++; newassoc = 1; - if (IEEE80211_IS_CHAN_ANYG(ic->ic_bsschan)) + if (IEEE80211_IS_CHAN_ANYG(ic->ic_bsschan) && + IEEE80211_IS_CHAN_FULL(ni->ni_chan)) ieee80211_node_join_11g(ic, ni); } else newassoc = 0; @@ -1822,7 +1832,8 @@ ni->ni_associd = 0; ic->ic_sta_assoc--; - if (IEEE80211_IS_CHAN_ANYG(ic->ic_bsschan)) + if (IEEE80211_IS_CHAN_ANYG(ic->ic_bsschan) && + IEEE80211_IS_CHAN_FULL(ni->ni_chan)) ieee80211_node_leave_11g(ic, ni); /* * Cleanup station state. In particular clear various ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#46 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_proto.c,v 1.32 2006/12/27 18:46:18 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_proto.c,v 1.34 2007/01/08 18:23:43 sam Exp $"); /* * IEEE 802.11 protocol support. @@ -130,7 +130,7 @@ if (ic->ic_auth->ia_detach) ic->ic_auth->ia_detach(ic); - IF_DRAIN(&ic->ic_mgtq); + ieee80211_drain_ifq(&ic->ic_mgtq); mtx_destroy(&ic->ic_mgtq.ifq_mtx); /* @@ -334,12 +334,23 @@ } } +static __inline int +findrix(const struct ieee80211_rateset *rs, int r) +{ + int i; + + for (i = 0; i < rs->rs_nrates; i++) + if ((rs->rs_rates[i] & IEEE80211_RATE_VAL) == r) + return i; + return -1; +} + int ieee80211_fix_rate(struct ieee80211_node *ni, int flags) { #define RV(v) ((v) & IEEE80211_RATE_VAL) struct ieee80211com *ic = ni->ni_ic; - int i, j, ignore, error; + int i, j, rix, error; int okrate, badrate, fixedrate; const struct ieee80211_rateset *srs; struct ieee80211_rateset *nrs; @@ -351,7 +362,6 @@ srs = ieee80211_get_suprates(ic, ni->ni_chan); nrs = &ni->ni_rates; for (i = 0; i < nrs->rs_nrates; ) { - ignore = 0; if (flags & IEEE80211_F_DOSORT) { /* * Sort rates. @@ -371,51 +381,40 @@ */ if (r == ic->ic_fixed_rate) fixedrate = r; + /* + * Check against supported rates. + */ + rix = findrix(srs, r); if (flags & IEEE80211_F_DONEGO) { - /* - * Check against supported rates. - */ - for (j = 0; j < srs->rs_nrates; j++) { - if (r == RV(srs->rs_rates[j])) { - /* - * Overwrite with the supported rate - * value so any basic rate bit is set. - * This insures that response we send - * to stations have the necessary basic - * rate bit set. - */ - nrs->rs_rates[i] = srs->rs_rates[j]; - break; - } - } - if (j == srs->rs_nrates) { + if (rix < 0) { /* * A rate in the node's rate set is not * supported. If this is a basic rate and we - * are operating as an AP then this is an error. + * are operating as a STA then this is an error. * Otherwise we just discard/ignore the rate. - * Note that this is important for 11b stations - * when they want to associate with an 11g AP. */ - if (ic->ic_opmode == IEEE80211_M_HOSTAP && + if ((flags & IEEE80211_F_JOIN) && (nrs->rs_rates[i] & IEEE80211_RATE_BASIC)) error++; - ignore++; + } else if ((flags & IEEE80211_F_JOIN) == 0) { + /* + * Overwrite with the supported rate + * value so any basic rate bit is set. + */ + nrs->rs_rates[i] = srs->rs_rates[rix]; } } - if (flags & IEEE80211_F_DODEL) { + if ((flags & IEEE80211_F_DODEL) && rix < 0) { /* * Delete unacceptable rates. */ - if (ignore) { - nrs->rs_nrates--; - for (j = i; j < nrs->rs_nrates; j++) - nrs->rs_rates[j] = nrs->rs_rates[j + 1]; - nrs->rs_rates[j] = 0; - continue; - } + nrs->rs_nrates--; + for (j = i; j < nrs->rs_nrates; j++) + nrs->rs_rates[j] = nrs->rs_rates[j + 1]; + nrs->rs_rates[j] = 0; + continue; } - if (!ignore) + if (rix >= 0) okrate = nrs->rs_rates[i]; i++; } @@ -1088,7 +1087,7 @@ default: break; } - goto reset; + break; case IEEE80211_S_ASSOC: switch (ic->ic_opmode) { case IEEE80211_M_STA: @@ -1103,16 +1102,18 @@ default: break; } - goto reset; + break; case IEEE80211_S_SCAN: ieee80211_cancel_scan(ic); - goto reset; + break; case IEEE80211_S_AUTH: - reset: - IF_DRAIN(&ic->ic_mgtq); + break; + } + if (ostate != IEEE80211_S_INIT) { + /* NB: optimize INIT -> INIT case */ + ieee80211_drain_ifq(&ic->ic_mgtq); ieee80211_reset_bss(ic); ieee80211_scan_flush(ic); - break; } if (ic->ic_auth->ia_detach != NULL) ic->ic_auth->ia_detach(ic); ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.h#28 (text+ko) ==== @@ -29,7 +29,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/net80211/ieee80211_proto.h,v 1.19 2006/07/26 03:15:15 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_proto.h,v 1.20 2007/01/08 17:24:51 sam Exp $ */ #ifndef _NET80211_IEEE80211_PROTO_H_ #define _NET80211_IEEE80211_PROTO_H_ @@ -179,6 +179,7 @@ #define IEEE80211_F_DOFRATE 0x00000002 /* use fixed rate */ #define IEEE80211_F_DONEGO 0x00000004 /* calc negotiated rate */ #define IEEE80211_F_DODEL 0x00000008 /* delete ignore rate */ +#define IEEE80211_F_JOIN 0x00000010 /* sta joining our bss */ int ieee80211_fix_rate(struct ieee80211_node *, int); /* ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#44 (text+ko) ==== @@ -29,7 +29,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/net80211/ieee80211_var.h,v 1.44 2006/12/27 18:46:18 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_var.h,v 1.45 2007/01/06 02:56:41 kmacy Exp $ */ #ifndef _NET80211_IEEE80211_VAR_H_ #define _NET80211_IEEE80211_VAR_H_ From owner-p4-projects@FreeBSD.ORG Sun Jan 21 00:02:11 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1461016A406; Sun, 21 Jan 2007 00:02:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E632516A404 for ; Sun, 21 Jan 2007 00:02:10 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D462E13C45A for ; Sun, 21 Jan 2007 00:02:10 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0L02AW3048813 for ; Sun, 21 Jan 2007 00:02:10 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0L02AwA048810 for perforce@freebsd.org; Sun, 21 Jan 2007 00:02:10 GMT (envelope-from sam@freebsd.org) Date: Sun, 21 Jan 2007 00:02:10 GMT Message-Id: <200701210002.l0L02AwA048810@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 113230 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 00:02:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=113230 Change 113230 by sam@sam_ebb on 2007/01/21 00:01:21 IFC @ 113228 Affected files ... .. //depot/projects/wifi/sys/dev/ath/ath_rate/sample/sample.c#11 integrate .. //depot/projects/wifi/sys/dev/ath/ath_rate/sample/sample.h#6 integrate .. //depot/projects/wifi/sys/dev/ath/if_ath.c#127 integrate .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#52 integrate Differences ... ==== //depot/projects/wifi/sys/dev/ath/ath_rate/sample/sample.c#11 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.15 2006/12/13 19:34:35 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.c,v 1.16 2007/01/15 01:17:44 sam Exp $"); /* * John Bicket's SampleRate control algorithm. @@ -534,24 +534,6 @@ short_tries, long_tries); return; } - - if (ts->ts_status) { /* this packet failed */ - DPRINTF(sc, ATH_DEBUG_RATE, -"%s: %s size %d rate/try [%d/%d %d/%d %d/%d %d/%d] FAIL tries [%d/%d]\n", - __func__, - ether_sprintf(an->an_node.ni_macaddr), - bin_to_size(size_to_bin(frame_size)), - sc->sc_hwmap[MS(ds0->ds_ctl3, AR_XmitRate0)].ieeerate, - MS(ds0->ds_ctl2, AR_XmitDataTries0), - sc->sc_hwmap[MS(ds0->ds_ctl3, AR_XmitRate1)].ieeerate, - MS(ds0->ds_ctl2, AR_XmitDataTries1), - sc->sc_hwmap[MS(ds0->ds_ctl3, AR_XmitRate2)].ieeerate, - MS(ds0->ds_ctl2, AR_XmitDataTries2), - sc->sc_hwmap[MS(ds0->ds_ctl3, AR_XmitRate3)].ieeerate, - MS(ds0->ds_ctl2, AR_XmitDataTries3), - short_tries, long_tries); - } - mrr = sc->sc_mrretry && !(ic->ic_flags & IEEE80211_F_USEPROT); if (!mrr || !(ts->ts_rate & HAL_TXSTAT_ALTRATE)) { int ndx = rate_to_ndx(sn, final_rate); @@ -572,32 +554,43 @@ 0, 0, short_tries, long_tries, ts->ts_status); } else { - int rate0, tries0, ndx0; - int rate1, tries1, ndx1; - int rate2, tries2, ndx2; - int rate3, tries3, ndx3; + int hwrate0, rate0, tries0, ndx0; + int hwrate1, rate1, tries1, ndx1; + int hwrate2, rate2, tries2, ndx2; + int hwrate3, rate3, tries3, ndx3; int finalTSIdx = ts->ts_finaltsi; /* * Process intermediate rates that failed. */ - rate0 = sc->sc_hwmap[MS(ds0->ds_ctl3, AR_XmitRate0)].ieeerate; + if (sc->sc_ah->ah_magic != 0x20065416) { + hwrate0 = MS(ds0->ds_ctl3, AR_XmitRate0); + hwrate1 = MS(ds0->ds_ctl3, AR_XmitRate1); + hwrate2 = MS(ds0->ds_ctl3, AR_XmitRate2); + hwrate3 = MS(ds0->ds_ctl3, AR_XmitRate3); + } else { + hwrate0 = MS(ds0->ds_ctl3, AR5416_XmitRate0); + hwrate1 = MS(ds0->ds_ctl3, AR5416_XmitRate1); + hwrate2 = MS(ds0->ds_ctl3, AR5416_XmitRate2); + hwrate3 = MS(ds0->ds_ctl3, AR5416_XmitRate3); + } + + rate0 = sc->sc_hwmap[hwrate0].ieeerate; tries0 = MS(ds0->ds_ctl2, AR_XmitDataTries0); ndx0 = rate_to_ndx(sn, rate0); - rate1 = sc->sc_hwmap[MS(ds0->ds_ctl3, AR_XmitRate1)].ieeerate; + rate1 = sc->sc_hwmap[hwrate1].ieeerate; tries1 = MS(ds0->ds_ctl2, AR_XmitDataTries1); ndx1 = rate_to_ndx(sn, rate1); - rate2 = sc->sc_hwmap[MS(ds0->ds_ctl3, AR_XmitRate2)].ieeerate; + rate2 = sc->sc_hwmap[hwrate2].ieeerate; tries2 = MS(ds0->ds_ctl2, AR_XmitDataTries2); ndx2 = rate_to_ndx(sn, rate2); - rate3 = sc->sc_hwmap[MS(ds0->ds_ctl3, AR_XmitRate3)].ieeerate; + rate3 = sc->sc_hwmap[hwrate3].ieeerate; tries3 = MS(ds0->ds_ctl2, AR_XmitDataTries3); ndx3 = rate_to_ndx(sn, rate3); -#if 1 DPRINTF(sc, ATH_DEBUG_RATE, "%s: %s size %d finaltsidx %d tries %d %s rate/try [%d/%d %d/%d %d/%d %d/%d]\n", __func__, ether_sprintf(an->an_node.ni_macaddr), @@ -609,7 +602,6 @@ rate1, tries1, rate2, tries2, rate3, tries3); -#endif /* * NB: series > 0 are not penalized for failure ==== //depot/projects/wifi/sys/dev/ath/ath_rate/sample/sample.h#6 (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/ath_rate/sample/sample.h,v 1.6 2006/12/13 19:34:35 sam Exp $ + * $FreeBSD: src/sys/dev/ath/ath_rate/sample/sample.h,v 1.7 2007/01/15 01:17:44 sam Exp $ */ /* @@ -136,6 +136,16 @@ #define AR_XmitRate3 0x000f8000 /* series 3 tx rate */ #define AR_XmitRate3_S 15 +/* TX ds_ctl3 for 5416 */ +#define AR5416_XmitRate0 0x000000ff /* series 0 tx rate */ +#define AR5416_XmitRate0_S 0 +#define AR5416_XmitRate1 0x0000ff00 /* series 1 tx rate */ +#define AR5416_XmitRate1_S 8 +#define AR5416_XmitRate2 0x00ff0000 /* series 2 tx rate */ +#define AR5416_XmitRate2_S 16 +#define AR5416_XmitRate3 0xff000000 /* series 3 tx rate */ +#define AR5416_XmitRate3_S 24 + #define MS(_v, _f) (((_v) & (_f)) >> _f##_S) /* ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#127 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.158 2006/12/27 19:07:09 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.159 2007/01/15 01:15:57 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -370,8 +370,8 @@ ath_rate_setup(sc, IEEE80211_MODE_TURBO_A); ath_rate_setup(sc, IEEE80211_MODE_TURBO_G); ath_rate_setup(sc, IEEE80211_MODE_STURBO_A); - ath_rate_setup(sc, IEEE80211_MODE_11A_HALF); - ath_rate_setup(sc, IEEE80211_MODE_11A_QUARTER); + ath_rate_setup(sc, IEEE80211_MODE_HALF); + ath_rate_setup(sc, IEEE80211_MODE_QUARTER); /* NB: setup here so ath_rate_update is happy */ ath_setcurmode(sc, IEEE80211_MODE_11A); @@ -945,8 +945,13 @@ } } -static u_int -ath_chan2flags(struct ieee80211_channel *chan) +/* + * Convert net80211 channel to a HAL channel with the flags + * constrained to reflect the current operating mode and + * the frequency possibly mapped for GSM channels. + */ +static void +ath_mapchan(HAL_CHANNEL *hc, const struct ieee80211_channel *chan) { #define N(a) (sizeof(a) / sizeof(a[0])) static const u_int modeflags[] = { @@ -960,16 +965,17 @@ CHANNEL_ST /* IEEE80211_MODE_STURBO_A */ }; enum ieee80211_phymode mode = ieee80211_chan2mode(chan); - int flags; KASSERT(mode < N(modeflags), ("unexpected phy mode %u", mode)); KASSERT(modeflags[mode] != 0, ("mode %u undefined", mode)); - flags = modeflags[mode]; + hc->channelFlags = modeflags[mode]; if (IEEE80211_IS_CHAN_HALF(chan)) - flags |= CHANNEL_HALF; - else if (IEEE80211_IS_CHAN_QUARTER(chan)) - flags |= CHANNEL_QUARTER; - return flags; + hc->channelFlags |= CHANNEL_HALF; + if (IEEE80211_IS_CHAN_QUARTER(chan)) + hc->channelFlags |= CHANNEL_QUARTER; + + hc->channel = IEEE80211_IS_CHAN_GSM(chan) ? + 2422 + (922 - chan->ic_freq) : chan->ic_freq; #undef N } @@ -999,8 +1005,7 @@ * be followed by initialization of the appropriate bits * and then setup of the interrupt mask. */ - sc->sc_curchan.channel = ic->ic_curchan->ic_freq; - sc->sc_curchan.channelFlags = ath_chan2flags(ic->ic_curchan); + ath_mapchan(&sc->sc_curchan, ic->ic_curchan); if (!ath_hal_reset(ah, sc->sc_opmode, &sc->sc_curchan, AH_FALSE, &status)) { if_printf(ifp, "unable to reset hardware; hal status %u\n", status); @@ -1158,16 +1163,13 @@ struct ath_softc *sc = ifp->if_softc; struct ieee80211com *ic = &sc->sc_ic; struct ath_hal *ah = sc->sc_ah; - struct ieee80211_channel *c; HAL_STATUS status; /* * Convert to a HAL channel description with the flags * constrained to reflect the current operating mode. */ - c = ic->ic_curchan; - sc->sc_curchan.channel = c->ic_freq; - sc->sc_curchan.channelFlags = ath_chan2flags(c); + ath_mapchan(&sc->sc_curchan, ic->ic_curchan); ath_hal_intrset(ah, 0); /* disable interrupts */ ath_draintxq(sc); /* stop xmit side */ @@ -1185,7 +1187,7 @@ * that changes the channel so update any state that * might change as a result. */ - ath_chan_change(sc, c); + ath_chan_change(sc, ic->ic_curchan); if (ath_startrecv(sc) != 0) /* restart recv */ if_printf(ifp, "%s: unable to start recv logic\n", __func__); if (ic->ic_state == IEEE80211_S_RUN) @@ -2376,17 +2378,19 @@ struct ath_hal *ah = sc->sc_ah; u_int usec; - if (IEEE80211_IS_CHAN_A(ic->ic_curchan)) { - if (IEEE80211_IS_CHAN_HALF(ic->ic_curchan)) - usec = 13; - else if (IEEE80211_IS_CHAN_QUARTER(ic->ic_curchan)) - usec = 21; + if (IEEE80211_IS_CHAN_HALF(ic->ic_curchan)) + usec = 13; + else if (IEEE80211_IS_CHAN_QUARTER(ic->ic_curchan)) + usec = 21; + else if (IEEE80211_IS_CHAN_ANYG(ic->ic_curchan)) { + /* honor short/long slot time only in 11g */ + /* XXX shouldn't honor on pure g or turbo g channel */ + if (ic->ic_flags & IEEE80211_F_SHSLOT) + usec = HAL_SLOT_TIME_9; else - usec = HAL_SLOT_TIME_9; - } else if (ic->ic_flags & IEEE80211_F_SHSLOT) + usec = HAL_SLOT_TIME_20; + } else usec = HAL_SLOT_TIME_9; - else - usec = HAL_SLOT_TIME_20; DPRINTF(sc, ATH_DEBUG_RESET, "%s: chan %u MHz flags 0x%x %s slot, %u usec\n", @@ -3243,8 +3247,7 @@ *rssi = ath_node_getrssi(ni); if (ni->ni_chan != IEEE80211_CHAN_ANYC) { - hchan.channel = ni->ni_chan->ic_freq; - hchan.channelFlags = ath_chan2flags(ni->ni_chan); + ath_mapchan(&hchan, ni->ni_chan); *noise = ath_hal_getchannoise(ah, &hchan); } else *noise = -95; /* nominally correct */ @@ -4959,13 +4962,12 @@ * Change channels and update the h/w rate map * if we're switching; e.g. 11a to 11b/g. */ - mode = ieee80211_chan2mode(chan); - if (mode == IEEE80211_MODE_11A) { - if (IEEE80211_IS_CHAN_HALF(chan)) - mode = IEEE80211_MODE_11A_HALF; - else if (IEEE80211_IS_CHAN_QUARTER(chan)) - mode = IEEE80211_MODE_11A_QUARTER; - } + if (IEEE80211_IS_CHAN_HALF(chan)) + mode = IEEE80211_MODE_HALF; + else if (IEEE80211_IS_CHAN_QUARTER(chan)) + mode = IEEE80211_MODE_QUARTER; + else + mode = ieee80211_chan2mode(chan); if (mode != sc->sc_curmode) ath_setcurmode(sc, mode); /* @@ -4980,6 +4982,10 @@ flags = IEEE80211_CHAN_B; if (IEEE80211_IS_CHAN_TURBO(chan)) flags |= IEEE80211_CHAN_TURBO; + if (IEEE80211_IS_CHAN_HALF(chan)) + flags |= IEEE80211_CHAN_HALF; + if (IEEE80211_IS_CHAN_QUARTER(chan)) + flags |= IEEE80211_CHAN_QUARTER; sc->sc_tx_th.wt_chan_freq = sc->sc_rx_th.wr_chan_freq = htole16(chan->ic_freq); sc->sc_tx_th.wt_chan_flags = sc->sc_rx_th.wr_chan_flags = @@ -5040,8 +5046,7 @@ * the flags constrained to reflect the current * operating mode. */ - hchan.channel = chan->ic_freq; - hchan.channelFlags = ath_chan2flags(chan); + ath_mapchan(&hchan, chan); DPRINTF(sc, ATH_DEBUG_RESET, "%s: %u (%u MHz, hal flags 0x%x) -> %u (%u MHz, hal flags 0x%x)\n", @@ -5488,6 +5493,13 @@ ichan->ic_ieee += 37; /* XXX */ ichan->ic_freq = c->channel; ichan->ic_flags = c->channelFlags; + if (ath_hal_isgsmsku(ah)) { + /* remap to true frequencies */ + ichan->ic_freq = 922 + (2422 - ichan->ic_freq); + ichan->ic_flags |= IEEE80211_CHAN_GSM; + ichan->ic_ieee = ieee80211_mhz2ieee(ichan->ic_freq, + ichan->ic_flags); + } ichan->ic_maxregpower = c->maxRegTxPower; /* dBm */ ichan->ic_maxpower = c->maxTxPower / 2; /* 1/2 dBm */ ichan->ic_minpower = c->minTxPower / 2; /* 1/2 dBm */ @@ -5590,10 +5602,10 @@ case IEEE80211_MODE_11A: rt = ath_hal_getratetable(ah, HAL_MODE_11A); break; - case IEEE80211_MODE_11A_HALF: + case IEEE80211_MODE_HALF: rt = ath_hal_getratetable(ah, HAL_MODE_11A_HALF_RATE); break; - case IEEE80211_MODE_11A_QUARTER: + case IEEE80211_MODE_QUARTER: rt = ath_hal_getratetable(ah, HAL_MODE_11A_QUARTER_RATE); break; case IEEE80211_MODE_11B: @@ -5644,6 +5656,7 @@ { 4, 267, 66 }, { 2, 400, 100 }, { 0, 500, 130 }, + /* XXX half/quarter rates */ }; const HAL_RATE_TABLE *rt; int i, j; ==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#52 (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.56 2006/12/27 19:07:09 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.58 2007/01/15 04:26:19 sam Exp $ */ /* @@ -227,8 +227,8 @@ sc_outdoor : 1,/* outdoor operation */ sc_dturbo : 1; /* dynamic turbo in use */ /* rate tables */ -#define IEEE80211_MODE_11A_HALF (IEEE80211_MODE_MAX+0) -#define IEEE80211_MODE_11A_QUARTER (IEEE80211_MODE_MAX+1) +#define IEEE80211_MODE_HALF (IEEE80211_MODE_MAX+0) +#define IEEE80211_MODE_QUARTER (IEEE80211_MODE_MAX+1) const HAL_RATE_TABLE *sc_rates[IEEE80211_MODE_MAX+2]; const HAL_RATE_TABLE *sc_half_rates; /* half rate table */ const HAL_RATE_TABLE *sc_quarter_rates;/* quarter rate table */ @@ -579,6 +579,11 @@ (((ah)->ah_regdomain == 0 && (ah)->ah_countryCode == 842) || \ (ah)->ah_regdomain == 0x12) #endif +#if HAL_ABI_VERSION < 0x06122400 +/* XXX yech, can't get to regdomain so just hack a compat shim */ +#define ath_hal_isgsmsku(ah) \ + ((ah)->ah_countryCode == 843) +#endif #define ath_hal_setuprxdesc(_ah, _ds, _size, _intreq) \ ((*(_ah)->ah_setupRxDesc)((_ah), (_ds), (_size), (_intreq))) From owner-p4-projects@FreeBSD.ORG Sun Jan 21 01:40:22 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAEB616A405; Sun, 21 Jan 2007 01:40:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9125216A409 for ; Sun, 21 Jan 2007 01:40:21 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7B47813C471 for ; Sun, 21 Jan 2007 01:40:21 +0000 (UTC) (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 l0L1eIYE074826 for ; Sun, 21 Jan 2007 01:40:18 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0L1dHC3074749 for perforce@freebsd.org; Sun, 21 Jan 2007 01:39:17 GMT (envelope-from jb@freebsd.org) Date: Sun, 21 Jan 2007 01:39:17 GMT Message-Id: <200701210139.l0L1dHC3074749@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 113233 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 01:40:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=113233 Change 113233 by jb@jb_freebsd8 on 2007/01/21 01:38:11 IFC Affected files ... .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/book.sgml#5 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#8 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#8 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#8 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/books/handbook/vinum/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#12 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#41 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#27 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#17 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#7 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/laptop/article.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/releng/article.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/dev-model/book.sgml#5 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/book.sgml#6 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#10 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#11 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#8 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#15 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#36 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/flyer/flyer.tex#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#20 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/committers-guide/article.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/contributing/article.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/article.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ddwg/article.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/dialup-firewall/article.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/diskless-x/article.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/formatting-media/article.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ip-aliasing/article.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ipsec-must/article.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/make-world/article.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/mh/article.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/multi-os/article.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/new-users/article.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ntfs/article.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pam/article.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/ppp/article.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/problem-reports/article.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/programming-tools/article.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/pxe/article.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/articles/zip-drive/article.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/books.ent#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/catalog#3 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/share/sgml/freebsd.ent#1 branch .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/bibliography/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/desktop/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/install/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/introduction/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/pgpkeys/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/users/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/books/handbook/x11/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/share/sgml/authors.ent#4 delete .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/share/sgml/books.ent#2 integrate .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/share/sgml/catalog#4 integrate .. //depot/projects/dtrace/doc/pl_PL.ISO8859-2/share/sgml/mailing-lists.ent#4 integrate .. //depot/projects/dtrace/doc/ru_RU.KOI8-R/articles/committers-guide/article.sgml#6 integrate .. //depot/projects/dtrace/doc/ru_RU.KOI8-R/articles/console-server/article.sgml#3 integrate .. //depot/projects/dtrace/doc/ru_RU.KOI8-R/articles/explaining-bsd/article.sgml#3 integrate .. //depot/projects/dtrace/doc/ru_RU.KOI8-R/articles/laptop/article.sgml#3 integrate .. //depot/projects/dtrace/doc/ru_RU.KOI8-R/articles/linux-comparison/article.sgml#3 integrate .. //depot/projects/dtrace/doc/ru_RU.KOI8-R/books/faq/book.sgml#3 integrate .. //depot/projects/dtrace/doc/ru_RU.KOI8-R/books/handbook/boot/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/share/images/articles/releng/branches-releng6.pic#3 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/ache.key#3 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/db.key#1 branch .. //depot/projects/dtrace/doc/share/pgpkeys/dryice.key#1 branch .. //depot/projects/dtrace/doc/share/pgpkeys/nox.key#1 branch .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#21 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#21 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/simon.key#4 integrate .. //depot/projects/dtrace/doc/share/sgml/freebsd.ent#11 integrate .. //depot/projects/dtrace/doc/share/sgml/mirrors.xml#9 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/book.sgml#7 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/config/chapter.sgml#10 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/desktop/chapter.sgml#7 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml#9 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/install/chapter.sgml#13 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mac/chapter.sgml#8 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mail/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mirrors/chapter.sgml#9 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/multimedia/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/ppp-and-slip/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/security/chapter.sgml#11 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#15 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/share/sgml/authors.ent#7 integrate .. //depot/projects/dtrace/ports/CHANGES#9 integrate .. //depot/projects/dtrace/ports/COPYRIGHT#3 integrate .. //depot/projects/dtrace/ports/GIDs#11 integrate .. //depot/projects/dtrace/ports/LEGAL#18 integrate .. //depot/projects/dtrace/ports/MOVED#37 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gcc.mk#5 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gnome.mk#9 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gnustep.mk#9 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gstreamer.mk#8 integrate .. //depot/projects/dtrace/ports/Mk/bsd.kde.mk#5 integrate .. //depot/projects/dtrace/ports/Mk/bsd.lua.mk#7 integrate .. //depot/projects/dtrace/ports/Mk/bsd.port.mk#9 integrate .. //depot/projects/dtrace/ports/Mk/bsd.python.mk#10 integrate .. //depot/projects/dtrace/ports/Mk/bsd.ruby.mk#6 integrate .. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#15 integrate .. //depot/projects/dtrace/ports/Mk/bsd.tcl.mk#4 integrate .. //depot/projects/dtrace/ports/Mk/bsd.wx.mk#5 integrate .. //depot/projects/dtrace/ports/Tools/portbuild/scripts/processonelog#9 integrate .. //depot/projects/dtrace/ports/Tools/scripts/rmport#9 integrate .. //depot/projects/dtrace/ports/UIDs#12 integrate .. //depot/projects/dtrace/ports/UPDATING#29 integrate .. //depot/projects/dtrace/src/COPYRIGHT#4 integrate .. //depot/projects/dtrace/src/Makefile.inc1#26 integrate .. //depot/projects/dtrace/src/ObsoleteFiles.inc#20 integrate .. //depot/projects/dtrace/src/UPDATING#13 integrate .. //depot/projects/dtrace/src/bin/cat/cat.1#4 integrate .. //depot/projects/dtrace/src/bin/chmod/chmod.1#4 integrate .. //depot/projects/dtrace/src/bin/domainname/domainname.1#4 integrate .. //depot/projects/dtrace/src/bin/mkdir/mkdir.1#4 integrate .. //depot/projects/dtrace/src/bin/rm/rm.1#5 integrate .. //depot/projects/dtrace/src/bin/rmdir/rmdir.1#4 integrate .. //depot/projects/dtrace/src/bin/sh/exec.c#5 integrate .. //depot/projects/dtrace/src/bin/test/test.1#6 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/README#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/arithchk.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/dmisc.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/dtoa.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/g_Qfmt.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/g__fmt.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/g_ddfmt.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/g_dfmt.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/g_ffmt.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/g_xLfmt.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/g_xfmt.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/gdtoa.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/gdtoa.h#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/gdtoaimp.h#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/gethex.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/gmisc.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/hd_init.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/hexnan.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/makefile#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/misc.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/qnan.c#1 branch .. //depot/projects/dtrace/src/contrib/gdtoa/smisc.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtoIQ.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtoId.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtoIdd.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtoIf.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtoIg.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtoIx.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtoIxL.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtod.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtodI.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtodg.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtodnrp.c#1 branch .. //depot/projects/dtrace/src/contrib/gdtoa/strtof.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtopQ.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtopd.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtopdd.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtopf.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtopx.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtopxL.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtorQ.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtord.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtordd.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtorf.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtorx.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/strtorxL.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/sum.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/test/Qtest.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/test/dItest.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/test/ddtest.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/test/dt.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/test/dtest.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/test/dtst.out#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/test/ftest.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/test/getround.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/test/makefile#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/test/strtodt.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/test/x.ou0#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/test/x.ou1#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/test/xL.ou1#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/test/xLtest.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/test/xsum0.out#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/test/xtest.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/ulp.c#4 integrate .. //depot/projects/dtrace/src/contrib/gdtoa/xsum0.out#4 integrate .. //depot/projects/dtrace/src/contrib/groff/tmac/doc-common#4 integrate .. //depot/projects/dtrace/src/contrib/groff/tmac/doc-syms#4 integrate .. //depot/projects/dtrace/src/contrib/groff/tmac/groff_mdoc.man#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/CHANGELOG#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/CHANGES#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/FREEBSD-upgrade#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/INSTALL#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/NEWS#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/README#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/aclocal.m4#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/bind.c#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/callback.c#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/complete.c#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/config.h.in#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/configure#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/configure.in#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/display.c#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/doc/history.texi#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/doc/hstech.texi#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/doc/hsuser.texi#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/doc/readline.3#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/doc/rlman.texi#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/doc/rltech.texi#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/doc/rluser.texi#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/doc/rluserman.texi#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/doc/version.texi#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/examples/excallback.c#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/examples/rlfe/Makefile.in#3 integrate .. //depot/projects/dtrace/src/contrib/libreadline/histexpand.c#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/histfile.c#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/history.c#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/input.c#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/isearch.c#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/kill.c#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/macro.c#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/misc.c#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/readline.c#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/readline.h#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/rlconf.h#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/rlmbutil.h#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/rlprivate.h#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/rltty.c#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/search.c#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/signals.c#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/support/shlib-install#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/support/shobj-conf#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/terminal.c#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/text.c#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/tilde.c#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/undo.c#4 integrate .. //depot/projects/dtrace/src/contrib/libreadline/vi_mode.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ANNOUNCE#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/AUTHORS#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/FREEBSD-Xlist#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/FREEBSD-upgrade#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/INSTALL#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/MANIFEST#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/Makefile.glibc#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/Makefile.os2#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/NEWS#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/README#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/README.emx#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/README.glibc#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/TO-DO#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/aclocal.m4#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/announce.html.in#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/c++/Makefile.in#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/c++/NEWS#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/c++/PROBLEMS#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/c++/README-first#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/c++/cursesapp.cc#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/c++/cursesapp.h#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/c++/cursesf.cc#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/c++/cursesf.h#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/c++/cursesm.cc#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/c++/cursesm.h#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/c++/cursesmain.cc#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/c++/cursesp.cc#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/c++/cursesp.h#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/c++/cursespad.cc#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/c++/cursesw.cc#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/c++/cursesw.h#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/c++/cursslk.cc#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/c++/cursslk.h#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/c++/demo.cc#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/c++/edit_cfg.sh#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/c++/etip.h.in#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/c++/headers#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/c++/internal.h#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/c++/modules#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/config.guess#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/config.sub#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/configure#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/configure.in#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/convert_configure.pl#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/dist.mk#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/doc/hackguide.doc#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/doc/html/NCURSES-Programming-HOWTO.html#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/doc/html/announce.html#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/doc/html/hackguide.html#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/doc/html/ncurses-intro.html#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/doc/ncurses-intro.doc#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/READ.ME#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/f_trace.c#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/form/fld_arg.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fld_attr.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fld_current.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fld_def.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fld_dup.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fld_ftchoice.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fld_ftlink.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fld_info.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fld_just.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fld_link.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fld_max.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fld_move.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fld_newftyp.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fld_opts.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fld_pad.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fld_page.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fld_stat.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fld_type.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fld_user.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/form.h#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/form.priv.h#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/frm_cursor.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/frm_data.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/frm_def.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/frm_driver.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/frm_hook.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/frm_opts.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/frm_page.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/frm_post.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/frm_req_name.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/frm_scale.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/frm_sub.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/frm_user.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/frm_win.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fty_alnum.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fty_alpha.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fty_enum.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fty_int.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fty_ipv4.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fty_num.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fty_regex.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/llib-lform#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/llib-lformw#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/form/modules#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/Caps#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/Caps.aix4#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/Caps.hpux11#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/include/Caps.keys#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/Caps.osf1r5#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/Caps.uwin#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/MKhashsize.sh#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/MKkey_defs.sh#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/MKncurses_def.sh#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/MKparametrized.sh#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/MKterm.h.awk.in#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/curses.h.in#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/curses.tail#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/curses.wide#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/hashed_db.h#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/include/nc_alloc.h#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/nc_tparm.h#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/include/ncurses_cfg.hin#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/ncurses_defs#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/ncurses_dll.h#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/term_entry.h#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/tic.h#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/install-sh#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/captoinfo.1m#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/clear.1#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_add_wch.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_add_wchstr.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_addch.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_addchstr.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_addstr.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_addwstr.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_attr.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_beep.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_bkgd.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_bkgrnd.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_border.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_border_set.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_clear.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_color.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_delch.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_deleteln.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_extend.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_get_wch.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_get_wstr.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_getcchar.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_getch.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_getstr.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_getyx.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_in_wch.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_in_wchstr.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_inch.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_inchstr.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_initscr.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_inopts.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_ins_wch.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_ins_wstr.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_insch.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_insstr.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_instr.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_inwstr.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_kernel.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_mouse.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_move.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_outopts.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_overlay.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_pad.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_print.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_printw.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_refresh.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_scanw.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_scr_dump.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_scroll.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_slk.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_termattrs.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_termcap.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_terminfo.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_touch.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_trace.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_util.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_window.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/default_colors.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/define_key.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_cursor.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_data.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_driver.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_field.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_field_attributes.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_field_buffer.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_field_info.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_field_just.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_field_new.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_field_opts.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_field_userptr.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_field_validation.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_fieldtype.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_hook.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_new.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_new_page.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_opts.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_page.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_post.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_requestname.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_userptr.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_win.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/infocmp.1m#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/infotocap.1m#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/key_defined.3x#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/man/keybound.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/keyok.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/legacy_coding.3x#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/man/make_sed.sh#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/man_db.renames#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/manlinks.sed#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/menu.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/menu_attributes.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/menu_cursor.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/menu_driver.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/menu_format.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/menu_hook.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/menu_items.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/menu_mark.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/menu_new.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/menu_opts.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/menu_pattern.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/menu_post.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/menu_requestname.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/menu_spacing.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/menu_userptr.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/menu_win.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/mitem_current.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/mitem_name.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/mitem_new.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/mitem_opts.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/mitem_userptr.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/mitem_value.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/ncurses.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/panel.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/resizeterm.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/term.5#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/term.7#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/terminfo.head#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/terminfo.tail#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/tic.1m#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/toe.1m#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/tput.1#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/tset.1#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/wresize.3x#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/READ.ME#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/eti.h#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/llib-lmenu#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/llib-lmenuw#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_attribs.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_cursor.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_driver.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_format.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_global.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_hook.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_item_cur.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_item_nam.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_item_new.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_item_opt.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_item_top.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_item_use.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_item_val.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_item_vis.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_items.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_new.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_opts.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_pad.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_pattern.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_post.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_req_name.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_scale.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_spacing.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_sub.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_trace.c#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_userptr.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/m_win.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/menu.h#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/menu.priv.h#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/mf_common.h#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/modules#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/misc/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/misc/chkdef.cmd#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/misc/cleantic.cmd#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/misc/cmpdef.cmd#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/misc/csort#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/misc/emx.src#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/misc/gen_edit.sh#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/misc/indent.pro#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/misc/jpf-indent#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/misc/makedef.cmd#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/misc/ncu-indent#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/misc/ncurses-config.in#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/misc/run_tic.in#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/misc/shlib#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/misc/terminfo.src#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/mk-0th.awk#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/mk-1st.awk#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/mk-2nd.awk#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/mkinstalldirs#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/README#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/README.IZ#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/SigAction.h#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/MKkeyname.awk#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/MKlib_gen.sh#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/MKunctrl.awk#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/README#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/define_key.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/key_defined.c#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/keybound.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/keyok.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/legacy_coding.c#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_addch.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_addstr.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_beep.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_bkgd.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_box.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_chgat.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_clrbot.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_color.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_colorset.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_dft_fgbg.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_erase.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_freeall.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_getch.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_getstr.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_hline.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_initscr.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_insch.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_insdel.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_insnstr.c#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_insstr.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_instr.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_mouse.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_move.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_mvwin.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_newterm.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_newwin.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_overlay.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_pad.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_printw.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_redrawln.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_refresh.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_restart.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_screen.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_scroll.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_set_term.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_slk.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_slkatr_set.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_slkatrof.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_slkatron.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_slkatrset.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_slkattr.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_slkclear.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_slkcolor.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_slklab.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_slkrefr.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_slkset.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_ungetch.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_vline.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_wattroff.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_wattron.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_window.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/resizeterm.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/safe_sprintf.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/sigaction.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/tries.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/version.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/vsscanf.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/wresize.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/curses.priv.h#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/llib-lncurses#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/llib-lncursesw#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/modules#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/MKfallback.sh#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/MKkeys_list.sh#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/MKnames.awk#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/README#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/access.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/add_tries.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/alloc_entry.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/alloc_ttype.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/captoinfo.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/comp_error.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/comp_expand.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/comp_hash.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/comp_parse.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/comp_scan.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/db_iterator.c#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/doalloc.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/free_ttype.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/hashed_db.c#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/home_terminfo.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/init_keytry.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_acs.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_cur_term.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_data.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_has_cap.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_kernel.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_napms.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_options.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_print.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_raw.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_setup.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_termcap.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_termname.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_tgoto.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_ti.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_tparm.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_tputs.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/make_keys.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/name_match.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/parse_entry.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/read_entry.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/read_termcap.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/setbuf.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/strings.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/write_entry.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/trace/README#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/trace/lib_trace.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/trace/lib_traceatr.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/trace/lib_tracebits.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/trace/lib_tracechr.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/trace/lib_tracedmp.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/trace/lib_tracemse.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/trace/trace_buf.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/trace/varargs.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/trace/visbuf.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tty/MKexpanded.sh#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tty/hashmap.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tty/lib_mvcur.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tty/lib_tstp.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tty/lib_twait.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tty/lib_vidattr.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tty/tty_display.h#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tty/tty_update.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/widechar/charable.c#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/widechar/lib_add_wch.c#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/widechar/lib_box_set.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/widechar/lib_cchar.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/widechar/lib_get_wch.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/widechar/lib_get_wstr.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/widechar/lib_in_wch.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/widechar/lib_ins_nwstr.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/widechar/lib_ins_wch.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/widechar/lib_inwstr.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/widechar/lib_pecho_wchar.c#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/widechar/lib_slk_wset.c#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/widechar/lib_wacs.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/panel/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/panel/llib-lpanel#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/panel/llib-lpanelw#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/panel/p_above.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/panel/p_below.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/panel/p_bottom.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/panel/p_delete.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/panel/p_hidden.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/panel/p_hide.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/panel/p_move.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/panel/p_new.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/panel/p_replace.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/panel/p_show.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/panel/p_top.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/panel/p_update.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/panel/p_user.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/panel/p_win.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/panel/panel.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/panel/panel.h#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/panel/panel.priv.h#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/progs/MKtermsort.sh#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/progs/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/progs/capconvert#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/progs/clear.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/progs/clear.sh#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/progs/dump_entry.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/progs/dump_entry.h#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/progs/infocmp.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/progs/modules#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/progs/progs.priv.h#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/progs/tic.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/progs/toe.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/progs/tput.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/progs/tset.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/tack/COPYING#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/tack/HISTORY#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/tack/Makefile.in#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/tack/ansi.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/tack/charset.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/tack/color.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/tack/control.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/tack/crum.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/tack/edit.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/tack/fun.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/tack/init.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/tack/menu.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/tack/modes.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/tack/modules#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/tack/output.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/tack/pad.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/tack/scan.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/tack/sync.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/tack/sysdep.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/tack/tack.1#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/tack/tack.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/tack/tack.h#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/tar-copy.sh#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/test/Makefile.in#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/README#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/blue.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/bs.6#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/bs.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/cardfile.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/cardfile.dat#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/configure#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/configure.in#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/ditto.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/dots.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/filter.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/firework.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/firstlast.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/gdc.6#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/gdc.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/hanoi.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/hashtest.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/keynames.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/knight.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/lrtest.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/modules#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/ncurses.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/ncurses_tst.hin#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/newdemo.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/railroad.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/rain.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/tclock.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/test.priv.h#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/testaddch.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/testcurs.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/testscanw.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/tracemunch#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/view.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/worm.c#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/test/xmas.c#4 delete .. //depot/projects/dtrace/src/etc/defaults/rc.conf#21 integrate .. //depot/projects/dtrace/src/etc/rc.d/abi#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/accounting#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/archdep#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/atm1#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/auto_linklocal#6 integrate .. //depot/projects/dtrace/src/etc/rc.d/bluetooth#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/bootconf.sh#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/bridge#3 integrate .. //depot/projects/dtrace/src/etc/rc.d/geli#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/hcsecd#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/ip6fw#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/ipfilter#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/ipfw#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/ipnat#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/jail#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/ldconfig#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/lpd#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/mdconfig#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/mdconfig2#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/mountcritremote#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/moused#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/natd#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/netif#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/nfsclient#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/nfsserver#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/nsswitch#7 integrate .. //depot/projects/dtrace/src/etc/rc.d/pf#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/pflog#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/pfsync#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/power_profile#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/pppoed#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/quota#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/sdpd#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/syscons#5 integrate .. //depot/projects/dtrace/src/etc/rc.d/syslogd#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/ugidfw#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/var#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/ypbind#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/yppasswdd#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/ypserv#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/ypset#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/ypupdated#4 integrate .. //depot/projects/dtrace/src/etc/rc.d/ypxfrd#5 integrate .. //depot/projects/dtrace/src/etc/rc.firewall#5 integrate .. //depot/projects/dtrace/src/etc/rc.subr#12 integrate .. //depot/projects/dtrace/src/etc/snmpd.config#5 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes#18 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes-o.real#4 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes.sp.ok#4 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/fortunes2-o#4 integrate .. //depot/projects/dtrace/src/games/fortune/datfiles/zippy#4 integrate .. //depot/projects/dtrace/src/gnu/lib/libreadline/Makefile.inc#4 integrate .. //depot/projects/dtrace/src/gnu/lib/libreadline/config.h#4 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/groff/tmac/mdoc.local#8 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/man/apropos/apropos.man#4 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/man/man/man.man#4 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/man/manpath/manpath.man#4 integrate .. //depot/projects/dtrace/src/include/arpa/nameser_compat.h#4 integrate .. //depot/projects/dtrace/src/include/mqueue.h#4 integrate .. //depot/projects/dtrace/src/include/unistd.h#5 integrate .. //depot/projects/dtrace/src/lib/Makefile#11 integrate .. //depot/projects/dtrace/src/lib/libarchive/COPYING#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive.h.in#8 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_check_magic.c#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_entry.3#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_entry.c#6 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_entry.h#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_platform.h#6 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_private.h#7 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read.3#6 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read.c#7 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_data_into_buffer.c#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_data_into_fd.c#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_extract.c#8 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_open_fd.c#6 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_open_file.c#8 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_open_filename.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_open_memory.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_compression_all.c#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_compression_bzip2.c#6 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_compression_compress.c#6 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_compression_gzip.c#6 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_compression_none.c#7 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_all.c#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_cpio.c#6 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_iso9660.c#6 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_tar.c#8 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_zip.c#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_string.c#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_string.h#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_string_sprintf.c#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_util.3#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_util.c#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write.3#6 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write.c#9 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_open_fd.c#6 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_open_file.c#6 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_open_filename.c#3 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_open_memory.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_set_compression_bzip2.c#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_set_compression_gzip.c#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_set_compression_none.c#6 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_set_format.c#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_set_format_by_name.c#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_set_format_cpio.c#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_set_format_pax.c#6 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_set_format_shar.c#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_set_format_ustar.c#6 integrate .. //depot/projects/dtrace/src/lib/libarchive/config_freebsd.h#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/libarchive-formats.5#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/libarchive.3#5 integrate .. //depot/projects/dtrace/src/lib/libarchive/tar.5#6 integrate .. //depot/projects/dtrace/src/lib/libc/amd64/SYS.h#4 integrate .. //depot/projects/dtrace/src/lib/libc/amd64/gd_qnan.h#1 branch .. //depot/projects/dtrace/src/lib/libc/amd64/gen/_setjmp.S#4 integrate .. //depot/projects/dtrace/src/lib/libc/amd64/gen/ldexp.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/amd64/gen/modf.S#4 integrate .. //depot/projects/dtrace/src/lib/libc/amd64/gen/setjmp.S#4 integrate .. //depot/projects/dtrace/src/lib/libc/amd64/gen/sigsetjmp.S#4 integrate .. //depot/projects/dtrace/src/lib/libc/amd64/sys/brk.S#4 integrate .. //depot/projects/dtrace/src/lib/libc/amd64/sys/cerror.S#4 integrate .. //depot/projects/dtrace/src/lib/libc/amd64/sys/exect.S#4 integrate .. //depot/projects/dtrace/src/lib/libc/amd64/sys/pipe.S#4 integrate .. //depot/projects/dtrace/src/lib/libc/amd64/sys/ptrace.S#4 integrate .. //depot/projects/dtrace/src/lib/libc/amd64/sys/reboot.S#4 integrate .. //depot/projects/dtrace/src/lib/libc/amd64/sys/sbrk.S#4 integrate .. //depot/projects/dtrace/src/lib/libc/amd64/sys/setlogin.S#4 integrate .. //depot/projects/dtrace/src/lib/libc/amd64/sys/sigreturn.S#4 integrate .. //depot/projects/dtrace/src/lib/libc/amd64/sys/vfork.S#4 integrate .. //depot/projects/dtrace/src/lib/libc/arm/gd_qnan.h#1 branch .. //depot/projects/dtrace/src/lib/libc/compat-43/creat.2#4 integrate .. //depot/projects/dtrace/src/lib/libc/compat-43/creat.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/compat-43/gethostid.3#4 integrate .. //depot/projects/dtrace/src/lib/libc/compat-43/gethostid.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/compat-43/getwd.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/compat-43/killpg.2#5 integrate .. //depot/projects/dtrace/src/lib/libc/compat-43/killpg.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/compat-43/sethostid.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/compat-43/setpgrp.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/compat-43/setrgid.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/compat-43/setruid.3#4 integrate .. //depot/projects/dtrace/src/lib/libc/compat-43/setruid.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/compat-43/sigcompat.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/compat-43/sigpause.2#4 integrate .. //depot/projects/dtrace/src/lib/libc/compat-43/sigsetmask.2#4 integrate .. //depot/projects/dtrace/src/lib/libc/compat-43/sigvec.2#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/btree/bt_close.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/btree/bt_conv.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/btree/bt_debug.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/btree/bt_delete.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/btree/bt_get.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/btree/bt_open.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/btree/bt_overflow.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/btree/bt_page.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/btree/bt_put.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/btree/bt_search.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/btree/bt_seq.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/btree/bt_split.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/btree/bt_utils.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/btree/btree.h#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/btree/extern.h#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/db/db.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/hash/extern.h#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/hash/hash.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/hash/hash.h#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/hash/hash_bigkey.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/hash/hash_buf.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/hash/hash_func.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/hash/hash_log2.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/hash/hash_page.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/hash/ndbm.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/hash/page.h#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/man/btree.3#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/man/dbopen.3#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/man/hash.3#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/man/mpool.3#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/man/recno.3#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/mpool/mpool.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/recno/extern.h#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/recno/rec_close.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/recno/rec_delete.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/recno/rec_get.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/recno/rec_open.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/recno/rec_put.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/recno/rec_search.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/recno/rec_seq.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/recno/rec_utils.c#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/recno/recno.h#4 integrate .. //depot/projects/dtrace/src/lib/libc/db/test/btree.tests/main.c#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 21 03:17:57 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AA8D16A404; Sun, 21 Jan 2007 03:17:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EFBD116A400 for ; Sun, 21 Jan 2007 03:17:56 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DD7B913C457 for ; Sun, 21 Jan 2007 03:17:56 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0L3Husv092815 for ; Sun, 21 Jan 2007 03:17:56 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0L3GWXD092794 for perforce@freebsd.org; Sun, 21 Jan 2007 03:16:32 GMT (envelope-from sam@freebsd.org) Date: Sun, 21 Jan 2007 03:16:32 GMT Message-Id: <200701210316.l0L3GWXD092794@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 113236 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 03:17:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=113236 Change 113236 by sam@sam_ebb on 2007/01/21 03:15:37 IFC @ 113228 Affected files ... .. //depot/projects/wifi/COPYRIGHT#4 integrate .. //depot/projects/wifi/Makefile.inc1#29 integrate .. //depot/projects/wifi/ObsoleteFiles.inc#9 integrate .. //depot/projects/wifi/bin/sh/exec.c#5 integrate .. //depot/projects/wifi/contrib/gdtoa/README#2 integrate .. //depot/projects/wifi/contrib/gdtoa/arithchk.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/dmisc.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/dtoa.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/g_Qfmt.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/g__fmt.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/g_ddfmt.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/g_dfmt.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/g_ffmt.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/g_xLfmt.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/g_xfmt.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/gdtoa.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/gdtoa.h#2 integrate .. //depot/projects/wifi/contrib/gdtoa/gdtoaimp.h#3 integrate .. //depot/projects/wifi/contrib/gdtoa/gethex.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/gmisc.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/hd_init.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/hexnan.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/makefile#2 integrate .. //depot/projects/wifi/contrib/gdtoa/misc.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/qnan.c#1 branch .. //depot/projects/wifi/contrib/gdtoa/smisc.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/strtoIQ.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/strtoId.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/strtoIdd.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/strtoIf.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/strtoIg.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/strtoIx.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/strtoIxL.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/strtod.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/strtodI.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/strtodg.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/strtodnrp.c#1 branch .. //depot/projects/wifi/contrib/gdtoa/strtof.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/strtopQ.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/strtopd.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/strtopdd.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/strtopf.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/strtopx.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/strtopxL.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/strtorQ.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/strtord.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/strtordd.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/strtorf.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/strtorx.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/strtorxL.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/sum.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/test/Qtest.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/test/dItest.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/test/ddtest.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/test/dt.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/test/dtest.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/test/dtst.out#2 integrate .. //depot/projects/wifi/contrib/gdtoa/test/ftest.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/test/getround.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/test/makefile#2 integrate .. //depot/projects/wifi/contrib/gdtoa/test/strtodt.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/test/x.ou0#2 integrate .. //depot/projects/wifi/contrib/gdtoa/test/x.ou1#2 integrate .. //depot/projects/wifi/contrib/gdtoa/test/xL.ou1#2 integrate .. //depot/projects/wifi/contrib/gdtoa/test/xLtest.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/test/xsum0.out#2 integrate .. //depot/projects/wifi/contrib/gdtoa/test/xtest.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/ulp.c#2 integrate .. //depot/projects/wifi/contrib/gdtoa/xsum0.out#2 integrate .. //depot/projects/wifi/contrib/libreadline/CHANGELOG#3 integrate .. //depot/projects/wifi/contrib/libreadline/CHANGES#3 integrate .. //depot/projects/wifi/contrib/libreadline/FREEBSD-upgrade#3 integrate .. //depot/projects/wifi/contrib/libreadline/INSTALL#3 integrate .. //depot/projects/wifi/contrib/libreadline/NEWS#3 integrate .. //depot/projects/wifi/contrib/libreadline/README#3 integrate .. //depot/projects/wifi/contrib/libreadline/aclocal.m4#3 integrate .. //depot/projects/wifi/contrib/libreadline/bind.c#3 integrate .. //depot/projects/wifi/contrib/libreadline/callback.c#3 integrate .. //depot/projects/wifi/contrib/libreadline/complete.c#3 integrate .. //depot/projects/wifi/contrib/libreadline/config.h.in#3 integrate .. //depot/projects/wifi/contrib/libreadline/configure#3 integrate .. //depot/projects/wifi/contrib/libreadline/configure.in#3 integrate .. //depot/projects/wifi/contrib/libreadline/display.c#3 integrate .. //depot/projects/wifi/contrib/libreadline/doc/history.texi#2 integrate .. //depot/projects/wifi/contrib/libreadline/doc/hstech.texi#2 integrate .. //depot/projects/wifi/contrib/libreadline/doc/hsuser.texi#2 integrate .. //depot/projects/wifi/contrib/libreadline/doc/readline.3#3 integrate .. //depot/projects/wifi/contrib/libreadline/doc/rlman.texi#2 integrate .. //depot/projects/wifi/contrib/libreadline/doc/rltech.texi#3 integrate .. //depot/projects/wifi/contrib/libreadline/doc/rluser.texi#3 integrate .. //depot/projects/wifi/contrib/libreadline/doc/rluserman.texi#3 integrate .. //depot/projects/wifi/contrib/libreadline/doc/version.texi#3 integrate .. //depot/projects/wifi/contrib/libreadline/examples/excallback.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/examples/rlfe/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/libreadline/histexpand.c#3 integrate .. //depot/projects/wifi/contrib/libreadline/histfile.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/history.c#3 integrate .. //depot/projects/wifi/contrib/libreadline/input.c#3 integrate .. //depot/projects/wifi/contrib/libreadline/isearch.c#3 integrate .. //depot/projects/wifi/contrib/libreadline/kill.c#2 integrate .. //depot/projects/wifi/contrib/libreadline/macro.c#3 integrate .. //depot/projects/wifi/contrib/libreadline/misc.c#3 integrate .. //depot/projects/wifi/contrib/libreadline/readline.c#3 integrate .. //depot/projects/wifi/contrib/libreadline/readline.h#3 integrate .. //depot/projects/wifi/contrib/libreadline/rlconf.h#2 integrate .. //depot/projects/wifi/contrib/libreadline/rlmbutil.h#3 integrate .. //depot/projects/wifi/contrib/libreadline/rlprivate.h#3 integrate .. //depot/projects/wifi/contrib/libreadline/rltty.c#3 integrate .. //depot/projects/wifi/contrib/libreadline/search.c#3 integrate .. //depot/projects/wifi/contrib/libreadline/signals.c#3 integrate .. //depot/projects/wifi/contrib/libreadline/support/shlib-install#3 integrate .. //depot/projects/wifi/contrib/libreadline/support/shobj-conf#3 integrate .. //depot/projects/wifi/contrib/libreadline/terminal.c#3 integrate .. //depot/projects/wifi/contrib/libreadline/text.c#3 integrate .. //depot/projects/wifi/contrib/libreadline/tilde.c#3 integrate .. //depot/projects/wifi/contrib/libreadline/undo.c#3 integrate .. //depot/projects/wifi/contrib/libreadline/vi_mode.c#3 integrate .. //depot/projects/wifi/contrib/ncurses/ANNOUNCE#2 integrate .. //depot/projects/wifi/contrib/ncurses/AUTHORS#1 branch .. //depot/projects/wifi/contrib/ncurses/FREEBSD-Xlist#1 branch .. //depot/projects/wifi/contrib/ncurses/FREEBSD-upgrade#1 branch .. //depot/projects/wifi/contrib/ncurses/INSTALL#2 integrate .. //depot/projects/wifi/contrib/ncurses/MANIFEST#2 integrate .. //depot/projects/wifi/contrib/ncurses/Makefile.glibc#2 delete .. //depot/projects/wifi/contrib/ncurses/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/ncurses/Makefile.os2#2 integrate .. //depot/projects/wifi/contrib/ncurses/NEWS#2 integrate .. //depot/projects/wifi/contrib/ncurses/README#2 integrate .. //depot/projects/wifi/contrib/ncurses/README.emx#2 integrate .. //depot/projects/wifi/contrib/ncurses/README.glibc#2 delete .. //depot/projects/wifi/contrib/ncurses/TO-DO#2 integrate .. //depot/projects/wifi/contrib/ncurses/aclocal.m4#2 integrate .. //depot/projects/wifi/contrib/ncurses/announce.html.in#2 integrate .. //depot/projects/wifi/contrib/ncurses/c++/Makefile.in#2 delete .. //depot/projects/wifi/contrib/ncurses/c++/NEWS#2 delete .. //depot/projects/wifi/contrib/ncurses/c++/PROBLEMS#2 delete .. //depot/projects/wifi/contrib/ncurses/c++/README-first#2 delete .. //depot/projects/wifi/contrib/ncurses/c++/cursesapp.cc#2 delete .. //depot/projects/wifi/contrib/ncurses/c++/cursesapp.h#2 delete .. //depot/projects/wifi/contrib/ncurses/c++/cursesf.cc#2 delete .. //depot/projects/wifi/contrib/ncurses/c++/cursesf.h#2 delete .. //depot/projects/wifi/contrib/ncurses/c++/cursesm.cc#2 delete .. //depot/projects/wifi/contrib/ncurses/c++/cursesm.h#2 delete .. //depot/projects/wifi/contrib/ncurses/c++/cursesmain.cc#2 delete .. //depot/projects/wifi/contrib/ncurses/c++/cursesp.cc#2 delete .. //depot/projects/wifi/contrib/ncurses/c++/cursesp.h#2 delete .. //depot/projects/wifi/contrib/ncurses/c++/cursespad.cc#2 delete .. //depot/projects/wifi/contrib/ncurses/c++/cursesw.cc#2 delete .. //depot/projects/wifi/contrib/ncurses/c++/cursesw.h#2 delete .. //depot/projects/wifi/contrib/ncurses/c++/cursslk.cc#2 delete .. //depot/projects/wifi/contrib/ncurses/c++/cursslk.h#2 delete .. //depot/projects/wifi/contrib/ncurses/c++/demo.cc#2 delete .. //depot/projects/wifi/contrib/ncurses/c++/edit_cfg.sh#2 delete .. //depot/projects/wifi/contrib/ncurses/c++/etip.h.in#2 delete .. //depot/projects/wifi/contrib/ncurses/c++/headers#2 delete .. //depot/projects/wifi/contrib/ncurses/c++/internal.h#2 delete .. //depot/projects/wifi/contrib/ncurses/c++/modules#2 delete .. //depot/projects/wifi/contrib/ncurses/config.guess#2 integrate .. //depot/projects/wifi/contrib/ncurses/config.sub#2 integrate .. //depot/projects/wifi/contrib/ncurses/configure#2 integrate .. //depot/projects/wifi/contrib/ncurses/configure.in#2 integrate .. //depot/projects/wifi/contrib/ncurses/convert_configure.pl#2 integrate .. //depot/projects/wifi/contrib/ncurses/dist.mk#2 integrate .. //depot/projects/wifi/contrib/ncurses/doc/hackguide.doc#2 integrate .. //depot/projects/wifi/contrib/ncurses/doc/html/NCURSES-Programming-HOWTO.html#1 branch .. //depot/projects/wifi/contrib/ncurses/doc/html/announce.html#2 integrate .. //depot/projects/wifi/contrib/ncurses/doc/html/hackguide.html#2 integrate .. //depot/projects/wifi/contrib/ncurses/doc/html/ncurses-intro.html#2 integrate .. //depot/projects/wifi/contrib/ncurses/doc/ncurses-intro.doc#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/READ.ME#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/f_trace.c#1 branch .. //depot/projects/wifi/contrib/ncurses/form/fld_arg.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/fld_attr.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/fld_current.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/fld_def.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/fld_dup.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/fld_ftchoice.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/fld_ftlink.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/fld_info.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/fld_just.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/fld_link.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/fld_max.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/fld_move.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/fld_newftyp.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/fld_opts.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/fld_pad.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/fld_page.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/fld_stat.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/fld_type.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/fld_user.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/form.h#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/form.priv.h#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/frm_cursor.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/frm_data.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/frm_def.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/frm_driver.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/frm_hook.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/frm_opts.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/frm_page.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/frm_post.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/frm_req_name.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/frm_scale.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/frm_sub.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/frm_user.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/frm_win.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/fty_alnum.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/fty_alpha.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/fty_enum.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/fty_int.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/fty_ipv4.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/fty_num.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/fty_regex.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/llib-lform#2 integrate .. //depot/projects/wifi/contrib/ncurses/form/llib-lformw#1 branch .. //depot/projects/wifi/contrib/ncurses/form/modules#2 integrate .. //depot/projects/wifi/contrib/ncurses/include/Caps#2 integrate .. //depot/projects/wifi/contrib/ncurses/include/Caps.aix4#2 integrate .. //depot/projects/wifi/contrib/ncurses/include/Caps.hpux11#1 branch .. //depot/projects/wifi/contrib/ncurses/include/Caps.keys#2 integrate .. //depot/projects/wifi/contrib/ncurses/include/Caps.osf1r5#2 integrate .. //depot/projects/wifi/contrib/ncurses/include/Caps.uwin#2 integrate .. //depot/projects/wifi/contrib/ncurses/include/MKhashsize.sh#2 integrate .. //depot/projects/wifi/contrib/ncurses/include/MKkey_defs.sh#2 integrate .. //depot/projects/wifi/contrib/ncurses/include/MKncurses_def.sh#2 integrate .. //depot/projects/wifi/contrib/ncurses/include/MKparametrized.sh#2 integrate .. //depot/projects/wifi/contrib/ncurses/include/MKterm.h.awk.in#2 integrate .. //depot/projects/wifi/contrib/ncurses/include/curses.h.in#2 integrate .. //depot/projects/wifi/contrib/ncurses/include/curses.tail#2 integrate .. //depot/projects/wifi/contrib/ncurses/include/curses.wide#2 integrate .. //depot/projects/wifi/contrib/ncurses/include/hashed_db.h#1 branch .. //depot/projects/wifi/contrib/ncurses/include/nc_alloc.h#2 integrate .. //depot/projects/wifi/contrib/ncurses/include/nc_tparm.h#1 branch .. //depot/projects/wifi/contrib/ncurses/include/ncurses_cfg.hin#2 integrate .. //depot/projects/wifi/contrib/ncurses/include/ncurses_defs#2 integrate .. //depot/projects/wifi/contrib/ncurses/include/ncurses_dll.h#2 integrate .. //depot/projects/wifi/contrib/ncurses/include/term_entry.h#2 integrate .. //depot/projects/wifi/contrib/ncurses/include/tic.h#2 integrate .. //depot/projects/wifi/contrib/ncurses/install-sh#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/captoinfo.1m#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/clear.1#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_add_wch.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_add_wchstr.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_addch.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_addchstr.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_addstr.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_addwstr.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_attr.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_beep.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_bkgd.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_bkgrnd.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_border.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_border_set.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_clear.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_color.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_delch.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_deleteln.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_extend.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_get_wch.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_get_wstr.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_getcchar.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_getch.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_getstr.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_getyx.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_in_wch.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_in_wchstr.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_inch.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_inchstr.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_initscr.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_inopts.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_ins_wch.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_ins_wstr.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_insch.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_insstr.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_instr.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_inwstr.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_kernel.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_mouse.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_move.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_outopts.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_overlay.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_pad.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_print.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_printw.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_refresh.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_scanw.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_scr_dump.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_scroll.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_slk.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_termattrs.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_termcap.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_terminfo.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_touch.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_trace.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_util.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/curs_window.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/default_colors.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/define_key.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/form.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_cursor.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_data.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_driver.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_field.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_field_attributes.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_field_buffer.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_field_info.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_field_just.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_field_new.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_field_opts.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_field_userptr.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_field_validation.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_fieldtype.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_hook.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_new.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_new_page.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_opts.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_page.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_post.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_requestname.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_userptr.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/form_win.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/infocmp.1m#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/infotocap.1m#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/key_defined.3x#1 branch .. //depot/projects/wifi/contrib/ncurses/man/keybound.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/keyok.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/legacy_coding.3x#1 branch .. //depot/projects/wifi/contrib/ncurses/man/make_sed.sh#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/man_db.renames#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/manlinks.sed#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/menu.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/menu_attributes.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/menu_cursor.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/menu_driver.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/menu_format.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/menu_hook.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/menu_items.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/menu_mark.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/menu_new.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/menu_opts.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/menu_pattern.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/menu_post.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/menu_requestname.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/menu_spacing.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/menu_userptr.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/menu_win.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/mitem_current.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/mitem_name.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/mitem_new.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/mitem_opts.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/mitem_userptr.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/mitem_value.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/ncurses.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/panel.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/resizeterm.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/term.5#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/term.7#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/terminfo.head#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/terminfo.tail#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/tic.1m#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/toe.1m#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/tput.1#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/tset.1#2 integrate .. //depot/projects/wifi/contrib/ncurses/man/wresize.3x#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/READ.ME#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/eti.h#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/llib-lmenu#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/llib-lmenuw#1 branch .. //depot/projects/wifi/contrib/ncurses/menu/m_attribs.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/m_cursor.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/m_driver.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/m_format.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/m_global.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/m_hook.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/m_item_cur.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/m_item_nam.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/m_item_new.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/m_item_opt.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/m_item_top.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/m_item_use.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/m_item_val.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/m_item_vis.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/m_items.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/m_new.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/m_opts.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/m_pad.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/m_pattern.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/m_post.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/m_req_name.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/m_scale.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/m_spacing.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/m_sub.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/m_trace.c#1 branch .. //depot/projects/wifi/contrib/ncurses/menu/m_userptr.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/m_win.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/menu.h#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/menu.priv.h#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/mf_common.h#2 integrate .. //depot/projects/wifi/contrib/ncurses/menu/modules#2 integrate .. //depot/projects/wifi/contrib/ncurses/misc/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/ncurses/misc/chkdef.cmd#2 integrate .. //depot/projects/wifi/contrib/ncurses/misc/cleantic.cmd#2 integrate .. //depot/projects/wifi/contrib/ncurses/misc/cmpdef.cmd#2 integrate .. //depot/projects/wifi/contrib/ncurses/misc/csort#1 branch .. //depot/projects/wifi/contrib/ncurses/misc/emx.src#2 integrate .. //depot/projects/wifi/contrib/ncurses/misc/gen_edit.sh#1 branch .. //depot/projects/wifi/contrib/ncurses/misc/indent.pro#2 delete .. //depot/projects/wifi/contrib/ncurses/misc/jpf-indent#1 branch .. //depot/projects/wifi/contrib/ncurses/misc/makedef.cmd#2 integrate .. //depot/projects/wifi/contrib/ncurses/misc/ncu-indent#1 branch .. //depot/projects/wifi/contrib/ncurses/misc/ncurses-config.in#1 branch .. //depot/projects/wifi/contrib/ncurses/misc/run_tic.in#2 integrate .. //depot/projects/wifi/contrib/ncurses/misc/shlib#2 integrate .. //depot/projects/wifi/contrib/ncurses/misc/terminfo.src#2 integrate .. //depot/projects/wifi/contrib/ncurses/mk-0th.awk#2 integrate .. //depot/projects/wifi/contrib/ncurses/mk-1st.awk#2 integrate .. //depot/projects/wifi/contrib/ncurses/mk-2nd.awk#2 integrate .. //depot/projects/wifi/contrib/ncurses/mkinstalldirs#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/README#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/README.IZ#1 branch .. //depot/projects/wifi/contrib/ncurses/ncurses/SigAction.h#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/MKkeyname.awk#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/MKlib_gen.sh#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/MKunctrl.awk#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/README#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/define_key.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/key_defined.c#1 branch .. //depot/projects/wifi/contrib/ncurses/ncurses/base/keybound.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/keyok.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/legacy_coding.c#1 branch .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_addch.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_addstr.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_beep.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_bkgd.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_box.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_chgat.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_clrbot.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_color.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_colorset.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_dft_fgbg.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_erase.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_freeall.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_getch.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_getstr.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_hline.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_initscr.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_insch.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_insdel.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_insnstr.c#1 branch .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_insstr.c#2 delete .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_instr.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_mouse.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_move.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_mvwin.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_newterm.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_newwin.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_overlay.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_pad.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_printw.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_redrawln.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_refresh.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_restart.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_screen.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_scroll.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_set_term.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_slk.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_slkatr_set.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_slkatrof.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_slkatron.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_slkatrset.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_slkattr.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_slkclear.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_slkcolor.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_slklab.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_slkrefr.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_slkset.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_ungetch.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_vline.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_wattroff.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_wattron.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/lib_window.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/resizeterm.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/safe_sprintf.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/sigaction.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/tries.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/version.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/vsscanf.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/base/wresize.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/curses.priv.h#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/llib-lncurses#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/llib-lncursesw#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/modules#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/MKfallback.sh#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/MKkeys_list.sh#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/MKnames.awk#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/README#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/access.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/add_tries.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/alloc_entry.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/alloc_ttype.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/captoinfo.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/comp_error.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/comp_expand.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/comp_hash.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/comp_parse.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/comp_scan.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/db_iterator.c#1 branch .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/doalloc.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/free_ttype.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/hashed_db.c#1 branch .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/home_terminfo.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/init_keytry.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_acs.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_cur_term.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_data.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_has_cap.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_kernel.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_napms.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_options.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_print.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_raw.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_setup.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_termcap.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_termname.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_tgoto.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_ti.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_tparm.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_tputs.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/make_keys.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/name_match.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/parse_entry.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/read_entry.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/read_termcap.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/setbuf.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/strings.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#1 branch .. //depot/projects/wifi/contrib/ncurses/ncurses/tinfo/write_entry.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/trace/README#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/trace/lib_trace.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/trace/lib_traceatr.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/trace/lib_tracebits.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/trace/lib_tracechr.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/trace/lib_tracedmp.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/trace/lib_tracemse.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/trace/trace_buf.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/trace/varargs.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/trace/visbuf.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tty/MKexpanded.sh#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tty/hashmap.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tty/lib_mvcur.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tty/lib_tstp.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tty/lib_twait.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tty/lib_vidattr.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tty/tty_display.h#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/tty/tty_update.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/widechar/charable.c#1 branch .. //depot/projects/wifi/contrib/ncurses/ncurses/widechar/lib_add_wch.c#1 branch .. //depot/projects/wifi/contrib/ncurses/ncurses/widechar/lib_box_set.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/widechar/lib_cchar.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/widechar/lib_get_wch.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/widechar/lib_get_wstr.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/widechar/lib_in_wch.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/widechar/lib_ins_nwstr.c#2 delete .. //depot/projects/wifi/contrib/ncurses/ncurses/widechar/lib_ins_wch.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/widechar/lib_inwstr.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/widechar/lib_pecho_wchar.c#1 branch .. //depot/projects/wifi/contrib/ncurses/ncurses/widechar/lib_slk_wset.c#1 branch .. //depot/projects/wifi/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/widechar/lib_wacs.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/panel/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/ncurses/panel/llib-lpanel#2 integrate .. //depot/projects/wifi/contrib/ncurses/panel/llib-lpanelw#1 branch .. //depot/projects/wifi/contrib/ncurses/panel/p_above.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/panel/p_below.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/panel/p_bottom.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/panel/p_delete.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/panel/p_hidden.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/panel/p_hide.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/panel/p_move.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/panel/p_new.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/panel/p_replace.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/panel/p_show.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/panel/p_top.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/panel/p_update.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/panel/p_user.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/panel/p_win.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/panel/panel.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/panel/panel.h#2 integrate .. //depot/projects/wifi/contrib/ncurses/panel/panel.priv.h#2 integrate .. //depot/projects/wifi/contrib/ncurses/progs/MKtermsort.sh#2 integrate .. //depot/projects/wifi/contrib/ncurses/progs/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/ncurses/progs/capconvert#2 integrate .. //depot/projects/wifi/contrib/ncurses/progs/clear.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/progs/clear.sh#2 integrate .. //depot/projects/wifi/contrib/ncurses/progs/dump_entry.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/progs/dump_entry.h#2 integrate .. //depot/projects/wifi/contrib/ncurses/progs/infocmp.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/progs/modules#2 integrate .. //depot/projects/wifi/contrib/ncurses/progs/progs.priv.h#2 integrate .. //depot/projects/wifi/contrib/ncurses/progs/tic.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/progs/toe.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/progs/tput.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/progs/tset.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/tack/COPYING#2 integrate .. //depot/projects/wifi/contrib/ncurses/tack/HISTORY#2 integrate .. //depot/projects/wifi/contrib/ncurses/tack/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/ncurses/tack/ansi.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/tack/charset.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/tack/color.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/tack/control.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/tack/crum.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/tack/edit.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/tack/fun.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/tack/init.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/tack/menu.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/tack/modes.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/tack/modules#2 integrate .. //depot/projects/wifi/contrib/ncurses/tack/output.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/tack/pad.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/tack/scan.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/tack/sync.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/tack/sysdep.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/tack/tack.1#2 integrate .. //depot/projects/wifi/contrib/ncurses/tack/tack.c#2 integrate .. //depot/projects/wifi/contrib/ncurses/tack/tack.h#2 integrate .. //depot/projects/wifi/contrib/ncurses/tar-copy.sh#2 integrate .. //depot/projects/wifi/contrib/ncurses/test/Makefile.in#2 delete .. //depot/projects/wifi/contrib/ncurses/test/README#2 delete .. //depot/projects/wifi/contrib/ncurses/test/blue.c#2 delete .. //depot/projects/wifi/contrib/ncurses/test/bs.6#2 delete .. //depot/projects/wifi/contrib/ncurses/test/bs.c#2 delete .. //depot/projects/wifi/contrib/ncurses/test/cardfile.c#2 delete .. //depot/projects/wifi/contrib/ncurses/test/cardfile.dat#2 delete .. //depot/projects/wifi/contrib/ncurses/test/configure#2 delete .. //depot/projects/wifi/contrib/ncurses/test/configure.in#2 delete .. //depot/projects/wifi/contrib/ncurses/test/ditto.c#2 delete .. //depot/projects/wifi/contrib/ncurses/test/dots.c#2 delete .. //depot/projects/wifi/contrib/ncurses/test/filter.c#2 delete .. //depot/projects/wifi/contrib/ncurses/test/firework.c#2 delete .. //depot/projects/wifi/contrib/ncurses/test/firstlast.c#2 delete .. //depot/projects/wifi/contrib/ncurses/test/gdc.6#2 delete .. //depot/projects/wifi/contrib/ncurses/test/gdc.c#2 delete .. //depot/projects/wifi/contrib/ncurses/test/hanoi.c#2 delete .. //depot/projects/wifi/contrib/ncurses/test/hashtest.c#2 delete .. //depot/projects/wifi/contrib/ncurses/test/keynames.c#2 delete .. //depot/projects/wifi/contrib/ncurses/test/knight.c#2 delete .. //depot/projects/wifi/contrib/ncurses/test/lrtest.c#2 delete .. //depot/projects/wifi/contrib/ncurses/test/modules#2 delete .. //depot/projects/wifi/contrib/ncurses/test/ncurses.c#2 delete .. //depot/projects/wifi/contrib/ncurses/test/ncurses_tst.hin#2 delete .. //depot/projects/wifi/contrib/ncurses/test/newdemo.c#2 delete .. //depot/projects/wifi/contrib/ncurses/test/railroad.c#2 delete .. //depot/projects/wifi/contrib/ncurses/test/rain.c#2 delete .. //depot/projects/wifi/contrib/ncurses/test/tclock.c#2 delete .. //depot/projects/wifi/contrib/ncurses/test/test.priv.h#2 delete .. //depot/projects/wifi/contrib/ncurses/test/testaddch.c#2 delete .. //depot/projects/wifi/contrib/ncurses/test/testcurs.c#2 delete .. //depot/projects/wifi/contrib/ncurses/test/testscanw.c#2 delete .. //depot/projects/wifi/contrib/ncurses/test/tracemunch#2 delete .. //depot/projects/wifi/contrib/ncurses/test/view.c#2 delete .. //depot/projects/wifi/contrib/ncurses/test/worm.c#2 delete .. //depot/projects/wifi/contrib/ncurses/test/xmas.c#2 delete .. //depot/projects/wifi/etc/defaults/rc.conf#25 integrate .. //depot/projects/wifi/etc/rc.d/abi#5 integrate .. //depot/projects/wifi/etc/rc.d/accounting#2 integrate .. //depot/projects/wifi/etc/rc.d/archdep#4 integrate .. //depot/projects/wifi/etc/rc.d/atm1#2 integrate .. //depot/projects/wifi/etc/rc.d/auto_linklocal#2 integrate .. //depot/projects/wifi/etc/rc.d/bluetooth#2 integrate .. //depot/projects/wifi/etc/rc.d/bootconf.sh#2 integrate .. //depot/projects/wifi/etc/rc.d/bridge#2 integrate .. //depot/projects/wifi/etc/rc.d/geli#3 integrate .. //depot/projects/wifi/etc/rc.d/hcsecd#3 integrate .. //depot/projects/wifi/etc/rc.d/ip6fw#3 integrate .. //depot/projects/wifi/etc/rc.d/ipfilter#4 integrate .. //depot/projects/wifi/etc/rc.d/ipfw#5 integrate .. //depot/projects/wifi/etc/rc.d/ipnat#2 integrate .. //depot/projects/wifi/etc/rc.d/jail#9 integrate .. //depot/projects/wifi/etc/rc.d/ldconfig#6 integrate .. //depot/projects/wifi/etc/rc.d/lpd#3 integrate .. //depot/projects/wifi/etc/rc.d/mdconfig#2 integrate .. //depot/projects/wifi/etc/rc.d/mdconfig2#2 integrate .. //depot/projects/wifi/etc/rc.d/mountcritremote#5 integrate .. //depot/projects/wifi/etc/rc.d/moused#5 integrate .. //depot/projects/wifi/etc/rc.d/natd#3 integrate .. //depot/projects/wifi/etc/rc.d/netif#7 integrate .. //depot/projects/wifi/etc/rc.d/nfsclient#2 integrate .. //depot/projects/wifi/etc/rc.d/nfsserver#2 integrate .. //depot/projects/wifi/etc/rc.d/nsswitch#3 integrate .. //depot/projects/wifi/etc/rc.d/pf#7 integrate .. //depot/projects/wifi/etc/rc.d/pflog#5 integrate .. //depot/projects/wifi/etc/rc.d/pfsync#2 integrate .. //depot/projects/wifi/etc/rc.d/power_profile#6 integrate .. //depot/projects/wifi/etc/rc.d/pppoed#2 integrate .. //depot/projects/wifi/etc/rc.d/quota#2 integrate .. //depot/projects/wifi/etc/rc.d/sdpd#3 integrate .. //depot/projects/wifi/etc/rc.d/syscons#5 integrate .. //depot/projects/wifi/etc/rc.d/syslogd#3 integrate .. //depot/projects/wifi/etc/rc.d/ugidfw#4 integrate .. //depot/projects/wifi/etc/rc.d/var#4 integrate .. //depot/projects/wifi/etc/rc.d/ypbind#2 integrate .. //depot/projects/wifi/etc/rc.d/yppasswdd#2 integrate .. //depot/projects/wifi/etc/rc.d/ypserv#2 integrate .. //depot/projects/wifi/etc/rc.d/ypset#2 integrate .. //depot/projects/wifi/etc/rc.d/ypupdated#2 integrate .. //depot/projects/wifi/etc/rc.d/ypxfrd#3 integrate .. //depot/projects/wifi/etc/rc.firewall#4 integrate .. //depot/projects/wifi/etc/rc.subr#11 integrate .. //depot/projects/wifi/etc/snmpd.config#5 integrate .. //depot/projects/wifi/games/fortune/datfiles/fortunes#21 integrate .. //depot/projects/wifi/games/fortune/datfiles/fortunes-o.real#2 integrate .. //depot/projects/wifi/games/fortune/datfiles/fortunes.sp.ok#2 integrate .. //depot/projects/wifi/games/fortune/datfiles/fortunes2-o#5 integrate .. //depot/projects/wifi/games/fortune/datfiles/zippy#3 integrate .. //depot/projects/wifi/gnu/lib/libreadline/Makefile.inc#4 integrate .. //depot/projects/wifi/gnu/lib/libreadline/config.h#3 integrate .. //depot/projects/wifi/gnu/usr.bin/groff/tmac/mdoc.local#9 integrate .. //depot/projects/wifi/include/mqueue.h#2 integrate .. //depot/projects/wifi/lib/Makefile#14 integrate .. //depot/projects/wifi/lib/libarchive/COPYING#3 integrate .. //depot/projects/wifi/lib/libarchive/archive.h.in#11 integrate .. //depot/projects/wifi/lib/libarchive/archive_check_magic.c#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_entry.3#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_entry.c#11 integrate .. //depot/projects/wifi/lib/libarchive/archive_entry.h#7 integrate .. //depot/projects/wifi/lib/libarchive/archive_platform.h#11 integrate .. //depot/projects/wifi/lib/libarchive/archive_private.h#9 integrate .. //depot/projects/wifi/lib/libarchive/archive_read.3#11 integrate .. //depot/projects/wifi/lib/libarchive/archive_read.c#9 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_data_into_buffer.c#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_data_into_fd.c#6 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_extract.c#11 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_open_fd.c#5 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_open_file.c#6 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_open_filename.c#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_open_memory.c#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_compression_all.c#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_compression_bzip2.c#5 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_compression_compress.c#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_compression_gzip.c#5 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_compression_none.c#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_all.c#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_cpio.c#8 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_iso9660.c#9 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_tar.c#13 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_zip.c#6 integrate .. //depot/projects/wifi/lib/libarchive/archive_string.c#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_string.h#6 integrate .. //depot/projects/wifi/lib/libarchive/archive_string_sprintf.c#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_util.3#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_util.c#5 integrate .. //depot/projects/wifi/lib/libarchive/archive_write.3#8 integrate .. //depot/projects/wifi/lib/libarchive/archive_write.c#7 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_open_fd.c#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_open_file.c#5 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_open_filename.c#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_open_memory.c#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_compression_bzip2.c#5 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_compression_gzip.c#5 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_compression_none.c#5 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format.c#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_by_name.c#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_cpio.c#5 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_pax.c#15 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_shar.c#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_ustar.c#6 integrate .. //depot/projects/wifi/lib/libarchive/config_freebsd.h#2 integrate .. //depot/projects/wifi/lib/libarchive/libarchive-formats.5#10 integrate .. //depot/projects/wifi/lib/libarchive/libarchive.3#6 integrate .. //depot/projects/wifi/lib/libarchive/tar.5#8 integrate .. //depot/projects/wifi/lib/libc/amd64/SYS.h#2 integrate .. //depot/projects/wifi/lib/libc/amd64/gd_qnan.h#1 branch .. //depot/projects/wifi/lib/libc/amd64/gen/_setjmp.S#2 integrate .. //depot/projects/wifi/lib/libc/amd64/gen/ldexp.c#2 integrate .. //depot/projects/wifi/lib/libc/amd64/gen/modf.S#2 integrate .. //depot/projects/wifi/lib/libc/amd64/gen/setjmp.S#2 integrate .. //depot/projects/wifi/lib/libc/amd64/gen/sigsetjmp.S#2 integrate .. //depot/projects/wifi/lib/libc/amd64/sys/brk.S#3 integrate .. //depot/projects/wifi/lib/libc/amd64/sys/cerror.S#3 integrate .. //depot/projects/wifi/lib/libc/amd64/sys/exect.S#2 integrate .. //depot/projects/wifi/lib/libc/amd64/sys/pipe.S#2 integrate .. //depot/projects/wifi/lib/libc/amd64/sys/ptrace.S#2 integrate .. //depot/projects/wifi/lib/libc/amd64/sys/reboot.S#2 integrate .. //depot/projects/wifi/lib/libc/amd64/sys/sbrk.S#2 integrate .. //depot/projects/wifi/lib/libc/amd64/sys/setlogin.S#2 integrate .. //depot/projects/wifi/lib/libc/amd64/sys/sigreturn.S#2 integrate .. //depot/projects/wifi/lib/libc/amd64/sys/vfork.S#2 integrate .. //depot/projects/wifi/lib/libc/arm/gd_qnan.h#1 branch .. //depot/projects/wifi/lib/libc/compat-43/creat.2#2 integrate .. //depot/projects/wifi/lib/libc/compat-43/creat.c#2 integrate .. //depot/projects/wifi/lib/libc/compat-43/gethostid.3#3 integrate .. //depot/projects/wifi/lib/libc/compat-43/gethostid.c#3 integrate .. //depot/projects/wifi/lib/libc/compat-43/getwd.c#3 integrate .. //depot/projects/wifi/lib/libc/compat-43/killpg.2#3 integrate .. //depot/projects/wifi/lib/libc/compat-43/killpg.c#2 integrate .. //depot/projects/wifi/lib/libc/compat-43/sethostid.c#3 integrate .. //depot/projects/wifi/lib/libc/compat-43/setpgrp.c#2 integrate .. //depot/projects/wifi/lib/libc/compat-43/setrgid.c#2 integrate .. //depot/projects/wifi/lib/libc/compat-43/setruid.3#3 integrate .. //depot/projects/wifi/lib/libc/compat-43/setruid.c#2 integrate .. //depot/projects/wifi/lib/libc/compat-43/sigcompat.c#2 integrate .. //depot/projects/wifi/lib/libc/compat-43/sigpause.2#2 integrate .. //depot/projects/wifi/lib/libc/compat-43/sigsetmask.2#2 integrate .. //depot/projects/wifi/lib/libc/compat-43/sigvec.2#3 integrate .. //depot/projects/wifi/lib/libc/db/btree/bt_close.c#2 integrate .. //depot/projects/wifi/lib/libc/db/btree/bt_conv.c#2 integrate .. //depot/projects/wifi/lib/libc/db/btree/bt_debug.c#2 integrate .. //depot/projects/wifi/lib/libc/db/btree/bt_delete.c#2 integrate .. //depot/projects/wifi/lib/libc/db/btree/bt_get.c#2 integrate .. //depot/projects/wifi/lib/libc/db/btree/bt_open.c#2 integrate .. //depot/projects/wifi/lib/libc/db/btree/bt_overflow.c#2 integrate .. //depot/projects/wifi/lib/libc/db/btree/bt_page.c#2 integrate .. //depot/projects/wifi/lib/libc/db/btree/bt_put.c#2 integrate .. //depot/projects/wifi/lib/libc/db/btree/bt_search.c#2 integrate .. //depot/projects/wifi/lib/libc/db/btree/bt_seq.c#2 integrate .. //depot/projects/wifi/lib/libc/db/btree/bt_split.c#2 integrate .. //depot/projects/wifi/lib/libc/db/btree/bt_utils.c#2 integrate .. //depot/projects/wifi/lib/libc/db/btree/btree.h#2 integrate .. //depot/projects/wifi/lib/libc/db/btree/extern.h#2 integrate .. //depot/projects/wifi/lib/libc/db/db/db.c#2 integrate .. //depot/projects/wifi/lib/libc/db/hash/extern.h#2 integrate .. //depot/projects/wifi/lib/libc/db/hash/hash.c#2 integrate .. //depot/projects/wifi/lib/libc/db/hash/hash.h#2 integrate .. //depot/projects/wifi/lib/libc/db/hash/hash_bigkey.c#2 integrate .. //depot/projects/wifi/lib/libc/db/hash/hash_buf.c#2 integrate .. //depot/projects/wifi/lib/libc/db/hash/hash_func.c#2 integrate .. //depot/projects/wifi/lib/libc/db/hash/hash_log2.c#2 integrate .. //depot/projects/wifi/lib/libc/db/hash/hash_page.c#2 integrate .. //depot/projects/wifi/lib/libc/db/hash/ndbm.c#2 integrate .. //depot/projects/wifi/lib/libc/db/hash/page.h#2 integrate .. //depot/projects/wifi/lib/libc/db/man/btree.3#2 integrate .. //depot/projects/wifi/lib/libc/db/man/dbopen.3#4 integrate .. //depot/projects/wifi/lib/libc/db/man/hash.3#2 integrate .. //depot/projects/wifi/lib/libc/db/man/mpool.3#3 integrate .. //depot/projects/wifi/lib/libc/db/man/recno.3#2 integrate .. //depot/projects/wifi/lib/libc/db/mpool/mpool.c#2 integrate .. //depot/projects/wifi/lib/libc/db/recno/extern.h#2 integrate .. //depot/projects/wifi/lib/libc/db/recno/rec_close.c#2 integrate .. //depot/projects/wifi/lib/libc/db/recno/rec_delete.c#2 integrate .. //depot/projects/wifi/lib/libc/db/recno/rec_get.c#2 integrate .. //depot/projects/wifi/lib/libc/db/recno/rec_open.c#2 integrate .. //depot/projects/wifi/lib/libc/db/recno/rec_put.c#2 integrate .. //depot/projects/wifi/lib/libc/db/recno/rec_search.c#2 integrate .. //depot/projects/wifi/lib/libc/db/recno/rec_seq.c#2 integrate .. //depot/projects/wifi/lib/libc/db/recno/rec_utils.c#2 integrate .. //depot/projects/wifi/lib/libc/db/recno/recno.h#2 integrate .. //depot/projects/wifi/lib/libc/db/test/btree.tests/main.c#2 integrate .. //depot/projects/wifi/lib/libc/db/test/dbtest.c#2 integrate .. //depot/projects/wifi/lib/libc/db/test/hash.tests/driver2.c#2 integrate .. //depot/projects/wifi/lib/libc/db/test/hash.tests/tcreat3.c#2 integrate .. //depot/projects/wifi/lib/libc/db/test/hash.tests/tdel.c#2 integrate .. //depot/projects/wifi/lib/libc/db/test/hash.tests/thash4.c#2 integrate .. //depot/projects/wifi/lib/libc/db/test/hash.tests/tread2.c#2 integrate .. //depot/projects/wifi/lib/libc/db/test/hash.tests/tseq.c#2 integrate .. //depot/projects/wifi/lib/libc/db/test/hash.tests/tverify.c#2 integrate .. //depot/projects/wifi/lib/libc/gdtoa/_hdtoa.c#3 integrate .. //depot/projects/wifi/lib/libc/gen/__xuname.c#3 integrate .. //depot/projects/wifi/lib/libc/gen/_spinlock_stub.c#3 integrate .. //depot/projects/wifi/lib/libc/gen/alarm.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/alarm.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/assert.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/clock.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/clock.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/closedir.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/confstr.3#3 integrate .. //depot/projects/wifi/lib/libc/gen/confstr.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/crypt.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/ctermid.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/ctermid.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/daemon.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/daemon.c#3 integrate .. //depot/projects/wifi/lib/libc/gen/devname.3#3 integrate .. //depot/projects/wifi/lib/libc/gen/devname.c#3 integrate .. //depot/projects/wifi/lib/libc/gen/directory.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/disklabel.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/err.3#3 integrate .. //depot/projects/wifi/lib/libc/gen/err.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/errlst.c#3 integrate .. //depot/projects/wifi/lib/libc/gen/exec.3#4 integrate .. //depot/projects/wifi/lib/libc/gen/exec.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/fnmatch.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/fnmatch.c#3 integrate .. //depot/projects/wifi/lib/libc/gen/frexp.3#4 integrate .. //depot/projects/wifi/lib/libc/gen/fstab.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/fts.3#3 integrate .. //depot/projects/wifi/lib/libc/gen/fts.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/getbootfile.3#3 integrate .. //depot/projects/wifi/lib/libc/gen/getbootfile.c#3 integrate .. //depot/projects/wifi/lib/libc/gen/getbsize.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/getbsize.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/getcap.3#4 integrate .. //depot/projects/wifi/lib/libc/gen/getcap.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/getcwd.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/getcwd.c#4 integrate .. //depot/projects/wifi/lib/libc/gen/getdiskbyname.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/getdomainname.3#3 integrate .. //depot/projects/wifi/lib/libc/gen/getdomainname.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/getfsent.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/getgrent.3#4 integrate .. //depot/projects/wifi/lib/libc/gen/getgrouplist.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/getgrouplist.c#3 integrate .. //depot/projects/wifi/lib/libc/gen/gethostname.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/gethostname.c#4 integrate .. //depot/projects/wifi/lib/libc/gen/getloadavg.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/getloadavg.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/getlogin.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/getmntinfo.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/getmntinfo.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/getnetgrent.3#3 integrate .. //depot/projects/wifi/lib/libc/gen/getnetgrent.c#5 integrate .. //depot/projects/wifi/lib/libc/gen/getosreldate.c#4 integrate .. //depot/projects/wifi/lib/libc/gen/getpagesize.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/getpagesize.c#3 integrate .. //depot/projects/wifi/lib/libc/gen/getpass.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/getpwent.3#4 integrate .. //depot/projects/wifi/lib/libc/gen/getttyent.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/getttyent.c#4 integrate .. //depot/projects/wifi/lib/libc/gen/getusershell.3#3 integrate .. //depot/projects/wifi/lib/libc/gen/getusershell.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/getvfsbyname.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/getvfsbyname.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/glob.3#3 integrate .. //depot/projects/wifi/lib/libc/gen/glob.c#4 integrate .. //depot/projects/wifi/lib/libc/gen/initgroups.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/initgroups.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/isatty.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/ldexp.3#4 integrate .. //depot/projects/wifi/lib/libc/gen/modf.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/nice.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/nice.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/nlist.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/nlist.c#3 integrate .. //depot/projects/wifi/lib/libc/gen/opendir.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/pause.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/pause.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/popen.3#3 integrate .. //depot/projects/wifi/lib/libc/gen/popen.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/psignal.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/psignal.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/pw_scan.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/pw_scan.h#2 integrate .. //depot/projects/wifi/lib/libc/gen/pwcache.3#4 integrate .. //depot/projects/wifi/lib/libc/gen/pwcache.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/raise.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/raise.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/readdir.c#3 integrate .. //depot/projects/wifi/lib/libc/gen/rewinddir.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/scandir.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/scandir.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/seekdir.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/setdomainname.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/sethostname.c#3 integrate .. //depot/projects/wifi/lib/libc/gen/setjmp.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/setjmperr.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/setmode.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/setmode.c#3 integrate .. //depot/projects/wifi/lib/libc/gen/siginterrupt.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/siginterrupt.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/siglist.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/signal.3#5 integrate .. //depot/projects/wifi/lib/libc/gen/signal.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/sigsetops.3#3 integrate .. //depot/projects/wifi/lib/libc/gen/sigsetops.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/sleep.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/sleep.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/stringlist.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/strtofflags.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/strtofflags.c#3 integrate .. //depot/projects/wifi/lib/libc/gen/sysconf.3#4 integrate .. //depot/projects/wifi/lib/libc/gen/sysconf.c#3 integrate .. //depot/projects/wifi/lib/libc/gen/sysctl.3#5 integrate .. //depot/projects/wifi/lib/libc/gen/sysctl.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/syslog.3#3 integrate .. //depot/projects/wifi/lib/libc/gen/syslog.c#9 integrate .. //depot/projects/wifi/lib/libc/gen/tcgetpgrp.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/tcsendbreak.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/tcsetattr.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/tcsetpgrp.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/telldir.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/termios.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/time.3#3 integrate .. //depot/projects/wifi/lib/libc/gen/time.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/times.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/times.c#3 integrate .. //depot/projects/wifi/lib/libc/gen/timezone.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/timezone.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 21 04:08:05 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38FA016A402; Sun, 21 Jan 2007 04:08:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 25BED16A409 for ; Sun, 21 Jan 2007 04:07:59 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 15CF713C44B for ; Sun, 21 Jan 2007 04:07:59 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0L47wTl001858 for ; Sun, 21 Jan 2007 04:07:58 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0L47wQ2001855 for perforce@freebsd.org; Sun, 21 Jan 2007 04:07:58 GMT (envelope-from csjp@freebsd.org) Date: Sun, 21 Jan 2007 04:07:58 GMT Message-Id: <200701210407.l0L47wQ2001855@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 113238 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 04:08:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=113238 Change 113238 by csjp@csjp_xor on 2007/01/21 04:07:24 Add a note regarding endian fixes for ip6 address Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#49 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#49 (text+ko) ==== @@ -1,5 +1,7 @@ OpenBSM 1.0 alpha 14 +- Fix endian issues when processing IPv6 addresses for extended subject + and process tokens. - gcc41 warnings clean. OpenBSM 1.0 alpha 13 @@ -280,4 +282,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#48 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#49 $ From owner-p4-projects@FreeBSD.ORG Sun Jan 21 04:45:27 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67D7716A407; Sun, 21 Jan 2007 04:45:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CDFC316A401 for ; Sun, 21 Jan 2007 04:45:25 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BBABC13C448 for ; Sun, 21 Jan 2007 04:45:25 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0L4jPVB007794 for ; Sun, 21 Jan 2007 04:45:25 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0L4iifK007721 for perforce@freebsd.org; Sun, 21 Jan 2007 04:44:44 GMT (envelope-from marcel@freebsd.org) Date: Sun, 21 Jan 2007 04:44:44 GMT Message-Id: <200701210444.l0L4iifK007721@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 113239 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 04:45:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=113239 Change 113239 by marcel@marcel_xcllnt on 2007/01/21 04:43:48 IFC @113235 Affected files ... .. //depot/projects/powerpc/COPYRIGHT#2 integrate .. //depot/projects/powerpc/Makefile.inc1#2 integrate .. //depot/projects/powerpc/ObsoleteFiles.inc#2 integrate .. //depot/projects/powerpc/UPDATING#3 integrate .. //depot/projects/powerpc/bin/cat/cat.1#2 integrate .. //depot/projects/powerpc/bin/chmod/chmod.1#2 integrate .. //depot/projects/powerpc/bin/mkdir/mkdir.1#2 integrate .. //depot/projects/powerpc/bin/rm/rm.1#2 integrate .. //depot/projects/powerpc/bin/rmdir/rmdir.1#2 integrate .. //depot/projects/powerpc/bin/sh/exec.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/README#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/arithchk.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/dmisc.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/dtoa.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/g_Qfmt.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/g__fmt.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/g_ddfmt.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/g_dfmt.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/g_ffmt.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/g_xLfmt.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/g_xfmt.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/gdtoa.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/gdtoa.h#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/gdtoaimp.h#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/gethex.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/gmisc.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/hd_init.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/hexnan.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/makefile#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/misc.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/qnan.c#1 branch .. //depot/projects/powerpc/contrib/gdtoa/smisc.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtoIQ.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtoId.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtoIdd.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtoIf.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtoIg.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtoIx.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtoIxL.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtod.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtodI.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtodg.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtodnrp.c#1 branch .. //depot/projects/powerpc/contrib/gdtoa/strtof.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtopQ.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtopd.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtopdd.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtopf.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtopx.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtopxL.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtorQ.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtord.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtordd.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtorf.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtorx.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/strtorxL.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/sum.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/test/Qtest.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/test/dItest.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/test/ddtest.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/test/dt.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/test/dtest.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/test/dtst.out#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/test/ftest.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/test/getround.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/test/makefile#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/test/strtodt.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/test/x.ou0#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/test/x.ou1#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/test/xL.ou1#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/test/xLtest.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/test/xsum0.out#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/test/xtest.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/ulp.c#2 integrate .. //depot/projects/powerpc/contrib/gdtoa/xsum0.out#2 integrate .. //depot/projects/powerpc/contrib/groff/tmac/doc-common#2 integrate .. //depot/projects/powerpc/contrib/groff/tmac/doc-syms#2 integrate .. //depot/projects/powerpc/contrib/groff/tmac/groff_mdoc.man#2 integrate .. //depot/projects/powerpc/contrib/libreadline/CHANGELOG#2 integrate .. //depot/projects/powerpc/contrib/libreadline/CHANGES#2 integrate .. //depot/projects/powerpc/contrib/libreadline/FREEBSD-upgrade#2 integrate .. //depot/projects/powerpc/contrib/libreadline/INSTALL#2 integrate .. //depot/projects/powerpc/contrib/libreadline/NEWS#2 integrate .. //depot/projects/powerpc/contrib/libreadline/README#2 integrate .. //depot/projects/powerpc/contrib/libreadline/aclocal.m4#2 integrate .. //depot/projects/powerpc/contrib/libreadline/bind.c#2 integrate .. //depot/projects/powerpc/contrib/libreadline/callback.c#2 integrate .. //depot/projects/powerpc/contrib/libreadline/complete.c#2 integrate .. //depot/projects/powerpc/contrib/libreadline/config.h.in#2 integrate .. //depot/projects/powerpc/contrib/libreadline/configure#2 integrate .. //depot/projects/powerpc/contrib/libreadline/configure.in#2 integrate .. //depot/projects/powerpc/contrib/libreadline/display.c#2 integrate .. //depot/projects/powerpc/contrib/libreadline/doc/history.texi#2 integrate .. //depot/projects/powerpc/contrib/libreadline/doc/hstech.texi#2 integrate .. //depot/projects/powerpc/contrib/libreadline/doc/hsuser.texi#2 integrate .. //depot/projects/powerpc/contrib/libreadline/doc/readline.3#2 integrate .. //depot/projects/powerpc/contrib/libreadline/doc/rlman.texi#2 integrate .. //depot/projects/powerpc/contrib/libreadline/doc/rltech.texi#2 integrate .. //depot/projects/powerpc/contrib/libreadline/doc/rluser.texi#2 integrate .. //depot/projects/powerpc/contrib/libreadline/doc/rluserman.texi#2 integrate .. //depot/projects/powerpc/contrib/libreadline/doc/version.texi#2 integrate .. //depot/projects/powerpc/contrib/libreadline/examples/excallback.c#2 integrate .. //depot/projects/powerpc/contrib/libreadline/examples/rlfe/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/libreadline/histexpand.c#2 integrate .. //depot/projects/powerpc/contrib/libreadline/histfile.c#2 integrate .. //depot/projects/powerpc/contrib/libreadline/history.c#2 integrate .. //depot/projects/powerpc/contrib/libreadline/input.c#2 integrate .. //depot/projects/powerpc/contrib/libreadline/isearch.c#2 integrate .. //depot/projects/powerpc/contrib/libreadline/kill.c#2 integrate .. //depot/projects/powerpc/contrib/libreadline/macro.c#2 integrate .. //depot/projects/powerpc/contrib/libreadline/misc.c#2 integrate .. //depot/projects/powerpc/contrib/libreadline/readline.c#2 integrate .. //depot/projects/powerpc/contrib/libreadline/readline.h#2 integrate .. //depot/projects/powerpc/contrib/libreadline/rlconf.h#2 integrate .. //depot/projects/powerpc/contrib/libreadline/rlmbutil.h#2 integrate .. //depot/projects/powerpc/contrib/libreadline/rlprivate.h#2 integrate .. //depot/projects/powerpc/contrib/libreadline/rltty.c#2 integrate .. //depot/projects/powerpc/contrib/libreadline/search.c#2 integrate .. //depot/projects/powerpc/contrib/libreadline/signals.c#2 integrate .. //depot/projects/powerpc/contrib/libreadline/support/shlib-install#2 integrate .. //depot/projects/powerpc/contrib/libreadline/support/shobj-conf#2 integrate .. //depot/projects/powerpc/contrib/libreadline/terminal.c#2 integrate .. //depot/projects/powerpc/contrib/libreadline/text.c#2 integrate .. //depot/projects/powerpc/contrib/libreadline/tilde.c#2 integrate .. //depot/projects/powerpc/contrib/libreadline/undo.c#2 integrate .. //depot/projects/powerpc/contrib/libreadline/vi_mode.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ANNOUNCE#2 integrate .. //depot/projects/powerpc/contrib/ncurses/AUTHORS#1 branch .. //depot/projects/powerpc/contrib/ncurses/FREEBSD-Xlist#1 branch .. //depot/projects/powerpc/contrib/ncurses/FREEBSD-upgrade#1 branch .. //depot/projects/powerpc/contrib/ncurses/INSTALL#2 integrate .. //depot/projects/powerpc/contrib/ncurses/MANIFEST#2 integrate .. //depot/projects/powerpc/contrib/ncurses/Makefile.glibc#2 delete .. //depot/projects/powerpc/contrib/ncurses/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ncurses/Makefile.os2#2 integrate .. //depot/projects/powerpc/contrib/ncurses/NEWS#2 integrate .. //depot/projects/powerpc/contrib/ncurses/README#2 integrate .. //depot/projects/powerpc/contrib/ncurses/README.emx#2 integrate .. //depot/projects/powerpc/contrib/ncurses/README.glibc#2 delete .. //depot/projects/powerpc/contrib/ncurses/TO-DO#2 integrate .. //depot/projects/powerpc/contrib/ncurses/aclocal.m4#2 integrate .. //depot/projects/powerpc/contrib/ncurses/announce.html.in#2 integrate .. //depot/projects/powerpc/contrib/ncurses/c++/Makefile.in#2 delete .. //depot/projects/powerpc/contrib/ncurses/c++/NEWS#2 delete .. //depot/projects/powerpc/contrib/ncurses/c++/PROBLEMS#2 delete .. //depot/projects/powerpc/contrib/ncurses/c++/README-first#2 delete .. //depot/projects/powerpc/contrib/ncurses/c++/cursesapp.cc#2 delete .. //depot/projects/powerpc/contrib/ncurses/c++/cursesapp.h#2 delete .. //depot/projects/powerpc/contrib/ncurses/c++/cursesf.cc#2 delete .. //depot/projects/powerpc/contrib/ncurses/c++/cursesf.h#2 delete .. //depot/projects/powerpc/contrib/ncurses/c++/cursesm.cc#2 delete .. //depot/projects/powerpc/contrib/ncurses/c++/cursesm.h#2 delete .. //depot/projects/powerpc/contrib/ncurses/c++/cursesmain.cc#2 delete .. //depot/projects/powerpc/contrib/ncurses/c++/cursesp.cc#2 delete .. //depot/projects/powerpc/contrib/ncurses/c++/cursesp.h#2 delete .. //depot/projects/powerpc/contrib/ncurses/c++/cursespad.cc#2 delete .. //depot/projects/powerpc/contrib/ncurses/c++/cursesw.cc#2 delete .. //depot/projects/powerpc/contrib/ncurses/c++/cursesw.h#2 delete .. //depot/projects/powerpc/contrib/ncurses/c++/cursslk.cc#2 delete .. //depot/projects/powerpc/contrib/ncurses/c++/cursslk.h#2 delete .. //depot/projects/powerpc/contrib/ncurses/c++/demo.cc#2 delete .. //depot/projects/powerpc/contrib/ncurses/c++/edit_cfg.sh#2 delete .. //depot/projects/powerpc/contrib/ncurses/c++/etip.h.in#2 delete .. //depot/projects/powerpc/contrib/ncurses/c++/headers#2 delete .. //depot/projects/powerpc/contrib/ncurses/c++/internal.h#2 delete .. //depot/projects/powerpc/contrib/ncurses/c++/modules#2 delete .. //depot/projects/powerpc/contrib/ncurses/config.guess#2 integrate .. //depot/projects/powerpc/contrib/ncurses/config.sub#2 integrate .. //depot/projects/powerpc/contrib/ncurses/configure#2 integrate .. //depot/projects/powerpc/contrib/ncurses/configure.in#2 integrate .. //depot/projects/powerpc/contrib/ncurses/convert_configure.pl#2 integrate .. //depot/projects/powerpc/contrib/ncurses/dist.mk#2 integrate .. //depot/projects/powerpc/contrib/ncurses/doc/hackguide.doc#2 integrate .. //depot/projects/powerpc/contrib/ncurses/doc/html/NCURSES-Programming-HOWTO.html#1 branch .. //depot/projects/powerpc/contrib/ncurses/doc/html/announce.html#2 integrate .. //depot/projects/powerpc/contrib/ncurses/doc/html/hackguide.html#2 integrate .. //depot/projects/powerpc/contrib/ncurses/doc/html/ncurses-intro.html#2 integrate .. //depot/projects/powerpc/contrib/ncurses/doc/ncurses-intro.doc#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/READ.ME#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/f_trace.c#1 branch .. //depot/projects/powerpc/contrib/ncurses/form/fld_arg.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/fld_attr.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/fld_current.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/fld_def.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/fld_dup.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/fld_ftchoice.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/fld_ftlink.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/fld_info.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/fld_just.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/fld_link.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/fld_max.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/fld_move.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/fld_newftyp.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/fld_opts.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/fld_pad.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/fld_page.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/fld_stat.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/fld_type.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/fld_user.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/form.h#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/form.priv.h#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/frm_cursor.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/frm_data.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/frm_def.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/frm_driver.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/frm_hook.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/frm_opts.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/frm_page.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/frm_post.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/frm_req_name.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/frm_scale.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/frm_sub.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/frm_user.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/frm_win.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/fty_alnum.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/fty_alpha.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/fty_enum.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/fty_int.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/fty_ipv4.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/fty_num.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/fty_regex.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/llib-lform#2 integrate .. //depot/projects/powerpc/contrib/ncurses/form/llib-lformw#1 branch .. //depot/projects/powerpc/contrib/ncurses/form/modules#2 integrate .. //depot/projects/powerpc/contrib/ncurses/include/Caps#2 integrate .. //depot/projects/powerpc/contrib/ncurses/include/Caps.aix4#2 integrate .. //depot/projects/powerpc/contrib/ncurses/include/Caps.hpux11#1 branch .. //depot/projects/powerpc/contrib/ncurses/include/Caps.keys#2 integrate .. //depot/projects/powerpc/contrib/ncurses/include/Caps.osf1r5#2 integrate .. //depot/projects/powerpc/contrib/ncurses/include/Caps.uwin#2 integrate .. //depot/projects/powerpc/contrib/ncurses/include/MKhashsize.sh#2 integrate .. //depot/projects/powerpc/contrib/ncurses/include/MKkey_defs.sh#2 integrate .. //depot/projects/powerpc/contrib/ncurses/include/MKncurses_def.sh#2 integrate .. //depot/projects/powerpc/contrib/ncurses/include/MKparametrized.sh#2 integrate .. //depot/projects/powerpc/contrib/ncurses/include/MKterm.h.awk.in#2 integrate .. //depot/projects/powerpc/contrib/ncurses/include/curses.h.in#2 integrate .. //depot/projects/powerpc/contrib/ncurses/include/curses.tail#2 integrate .. //depot/projects/powerpc/contrib/ncurses/include/curses.wide#2 integrate .. //depot/projects/powerpc/contrib/ncurses/include/hashed_db.h#1 branch .. //depot/projects/powerpc/contrib/ncurses/include/nc_alloc.h#2 integrate .. //depot/projects/powerpc/contrib/ncurses/include/nc_tparm.h#1 branch .. //depot/projects/powerpc/contrib/ncurses/include/ncurses_cfg.hin#2 integrate .. //depot/projects/powerpc/contrib/ncurses/include/ncurses_defs#2 integrate .. //depot/projects/powerpc/contrib/ncurses/include/ncurses_dll.h#2 integrate .. //depot/projects/powerpc/contrib/ncurses/include/term_entry.h#2 integrate .. //depot/projects/powerpc/contrib/ncurses/include/tic.h#2 integrate .. //depot/projects/powerpc/contrib/ncurses/install-sh#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/captoinfo.1m#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/clear.1#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_add_wch.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_add_wchstr.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_addch.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_addchstr.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_addstr.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_addwstr.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_attr.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_beep.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_bkgd.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_bkgrnd.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_border.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_border_set.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_clear.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_color.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_delch.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_deleteln.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_extend.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_get_wch.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_get_wstr.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_getcchar.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_getch.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_getstr.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_getyx.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_in_wch.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_in_wchstr.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_inch.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_inchstr.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_initscr.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_inopts.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_ins_wch.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_ins_wstr.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_insch.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_insstr.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_instr.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_inwstr.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_kernel.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_mouse.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_move.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_outopts.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_overlay.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_pad.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_print.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_printw.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_refresh.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_scanw.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_scr_dump.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_scroll.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_slk.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_termattrs.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_termcap.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_terminfo.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_touch.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_trace.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_util.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/curs_window.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/default_colors.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/define_key.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/form.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/form_cursor.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/form_data.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/form_driver.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/form_field.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/form_field_attributes.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/form_field_buffer.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/form_field_info.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/form_field_just.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/form_field_new.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/form_field_opts.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/form_field_userptr.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/form_field_validation.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/form_fieldtype.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/form_hook.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/form_new.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/form_new_page.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/form_opts.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/form_page.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/form_post.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/form_requestname.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/form_userptr.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/form_win.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/infocmp.1m#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/infotocap.1m#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/key_defined.3x#1 branch .. //depot/projects/powerpc/contrib/ncurses/man/keybound.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/keyok.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/legacy_coding.3x#1 branch .. //depot/projects/powerpc/contrib/ncurses/man/make_sed.sh#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/man_db.renames#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/manlinks.sed#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/menu.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/menu_attributes.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/menu_cursor.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/menu_driver.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/menu_format.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/menu_hook.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/menu_items.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/menu_mark.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/menu_new.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/menu_opts.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/menu_pattern.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/menu_post.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/menu_requestname.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/menu_spacing.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/menu_userptr.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/menu_win.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/mitem_current.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/mitem_name.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/mitem_new.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/mitem_opts.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/mitem_userptr.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/mitem_value.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/ncurses.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/panel.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/resizeterm.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/term.5#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/term.7#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/terminfo.head#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/terminfo.tail#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/tic.1m#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/toe.1m#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/tput.1#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/tset.1#2 integrate .. //depot/projects/powerpc/contrib/ncurses/man/wresize.3x#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/READ.ME#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/eti.h#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/llib-lmenu#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/llib-lmenuw#1 branch .. //depot/projects/powerpc/contrib/ncurses/menu/m_attribs.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/m_cursor.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/m_driver.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/m_format.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/m_global.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/m_hook.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/m_item_cur.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/m_item_nam.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/m_item_new.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/m_item_opt.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/m_item_top.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/m_item_use.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/m_item_val.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/m_item_vis.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/m_items.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/m_new.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/m_opts.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/m_pad.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/m_pattern.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/m_post.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/m_req_name.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/m_scale.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/m_spacing.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/m_sub.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/m_trace.c#1 branch .. //depot/projects/powerpc/contrib/ncurses/menu/m_userptr.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/m_win.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/menu.h#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/menu.priv.h#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/mf_common.h#2 integrate .. //depot/projects/powerpc/contrib/ncurses/menu/modules#2 integrate .. //depot/projects/powerpc/contrib/ncurses/misc/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ncurses/misc/chkdef.cmd#2 integrate .. //depot/projects/powerpc/contrib/ncurses/misc/cleantic.cmd#2 integrate .. //depot/projects/powerpc/contrib/ncurses/misc/cmpdef.cmd#2 integrate .. //depot/projects/powerpc/contrib/ncurses/misc/csort#1 branch .. //depot/projects/powerpc/contrib/ncurses/misc/emx.src#2 integrate .. //depot/projects/powerpc/contrib/ncurses/misc/gen_edit.sh#1 branch .. //depot/projects/powerpc/contrib/ncurses/misc/indent.pro#2 delete .. //depot/projects/powerpc/contrib/ncurses/misc/jpf-indent#1 branch .. //depot/projects/powerpc/contrib/ncurses/misc/makedef.cmd#2 integrate .. //depot/projects/powerpc/contrib/ncurses/misc/ncu-indent#1 branch .. //depot/projects/powerpc/contrib/ncurses/misc/ncurses-config.in#1 branch .. //depot/projects/powerpc/contrib/ncurses/misc/run_tic.in#2 integrate .. //depot/projects/powerpc/contrib/ncurses/misc/shlib#2 integrate .. //depot/projects/powerpc/contrib/ncurses/misc/terminfo.src#2 integrate .. //depot/projects/powerpc/contrib/ncurses/mk-0th.awk#2 integrate .. //depot/projects/powerpc/contrib/ncurses/mk-1st.awk#2 integrate .. //depot/projects/powerpc/contrib/ncurses/mk-2nd.awk#2 integrate .. //depot/projects/powerpc/contrib/ncurses/mkinstalldirs#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/README#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/README.IZ#1 branch .. //depot/projects/powerpc/contrib/ncurses/ncurses/SigAction.h#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/MKkeyname.awk#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/MKlib_gen.sh#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/MKunctrl.awk#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/README#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/define_key.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/key_defined.c#1 branch .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/keybound.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/keyok.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/legacy_coding.c#1 branch .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_addch.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_addstr.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_beep.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_bkgd.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_box.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_chgat.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_clrbot.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_color.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_colorset.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_dft_fgbg.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_erase.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_freeall.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_getch.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_getstr.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_hline.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_initscr.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_insch.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_insdel.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_insnstr.c#1 branch .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_insstr.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_instr.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_mouse.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_move.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_mvwin.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_newterm.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_newwin.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_overlay.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_pad.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_printw.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_redrawln.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_refresh.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_restart.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_screen.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_scroll.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_set_term.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_slk.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_slkatr_set.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_slkatrof.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_slkatron.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_slkatrset.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_slkattr.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_slkclear.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_slkcolor.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_slklab.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_slkrefr.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_slkset.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_ungetch.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_vline.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_wattroff.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_wattron.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/lib_window.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/resizeterm.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/safe_sprintf.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/sigaction.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/tries.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/version.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/vsscanf.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/base/wresize.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/curses.priv.h#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/llib-lncurses#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/llib-lncursesw#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/modules#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/MKfallback.sh#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/MKkeys_list.sh#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/MKnames.awk#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/README#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/access.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/add_tries.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/alloc_entry.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/alloc_ttype.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/captoinfo.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/comp_error.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/comp_expand.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/comp_hash.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/comp_parse.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/comp_scan.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/db_iterator.c#1 branch .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/doalloc.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/free_ttype.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/hashed_db.c#1 branch .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/home_terminfo.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/init_keytry.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/lib_acs.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/lib_cur_term.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/lib_data.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/lib_has_cap.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/lib_kernel.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/lib_napms.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/lib_options.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/lib_print.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/lib_raw.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/lib_setup.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/lib_termcap.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/lib_termname.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/lib_tgoto.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/lib_ti.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/lib_tparm.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/lib_tputs.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/make_keys.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/name_match.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/parse_entry.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/read_entry.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/read_termcap.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/setbuf.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/strings.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#1 branch .. //depot/projects/powerpc/contrib/ncurses/ncurses/tinfo/write_entry.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/trace/README#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/trace/lib_trace.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/trace/lib_traceatr.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/trace/lib_tracebits.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/trace/lib_tracechr.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/trace/lib_tracedmp.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/trace/lib_tracemse.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/trace/trace_buf.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/trace/varargs.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/trace/visbuf.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tty/MKexpanded.sh#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tty/hashmap.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tty/lib_mvcur.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tty/lib_tstp.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tty/lib_twait.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tty/lib_vidattr.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tty/tty_display.h#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/tty/tty_update.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/widechar/charable.c#1 branch .. //depot/projects/powerpc/contrib/ncurses/ncurses/widechar/lib_add_wch.c#1 branch .. //depot/projects/powerpc/contrib/ncurses/ncurses/widechar/lib_box_set.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/widechar/lib_cchar.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/widechar/lib_get_wch.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/widechar/lib_get_wstr.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/widechar/lib_in_wch.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/widechar/lib_ins_nwstr.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/ncurses/widechar/lib_ins_wch.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/widechar/lib_inwstr.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/widechar/lib_pecho_wchar.c#1 branch .. //depot/projects/powerpc/contrib/ncurses/ncurses/widechar/lib_slk_wset.c#1 branch .. //depot/projects/powerpc/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/widechar/lib_wacs.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/panel/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ncurses/panel/llib-lpanel#2 integrate .. //depot/projects/powerpc/contrib/ncurses/panel/llib-lpanelw#1 branch .. //depot/projects/powerpc/contrib/ncurses/panel/p_above.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/panel/p_below.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/panel/p_bottom.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/panel/p_delete.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/panel/p_hidden.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/panel/p_hide.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/panel/p_move.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/panel/p_new.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/panel/p_replace.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/panel/p_show.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/panel/p_top.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/panel/p_update.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/panel/p_user.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/panel/p_win.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/panel/panel.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/panel/panel.h#2 integrate .. //depot/projects/powerpc/contrib/ncurses/panel/panel.priv.h#2 integrate .. //depot/projects/powerpc/contrib/ncurses/progs/MKtermsort.sh#2 integrate .. //depot/projects/powerpc/contrib/ncurses/progs/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ncurses/progs/capconvert#2 integrate .. //depot/projects/powerpc/contrib/ncurses/progs/clear.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/progs/clear.sh#2 integrate .. //depot/projects/powerpc/contrib/ncurses/progs/dump_entry.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/progs/dump_entry.h#2 integrate .. //depot/projects/powerpc/contrib/ncurses/progs/infocmp.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/progs/modules#2 integrate .. //depot/projects/powerpc/contrib/ncurses/progs/progs.priv.h#2 integrate .. //depot/projects/powerpc/contrib/ncurses/progs/tic.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/progs/toe.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/progs/tput.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/progs/tset.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/tack/COPYING#2 integrate .. //depot/projects/powerpc/contrib/ncurses/tack/HISTORY#2 integrate .. //depot/projects/powerpc/contrib/ncurses/tack/Makefile.in#2 integrate .. //depot/projects/powerpc/contrib/ncurses/tack/ansi.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/tack/charset.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/tack/color.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/tack/control.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/tack/crum.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/tack/edit.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/tack/fun.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/tack/init.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/tack/menu.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/tack/modes.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/tack/modules#2 integrate .. //depot/projects/powerpc/contrib/ncurses/tack/output.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/tack/pad.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/tack/scan.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/tack/sync.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/tack/sysdep.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/tack/tack.1#2 integrate .. //depot/projects/powerpc/contrib/ncurses/tack/tack.c#2 integrate .. //depot/projects/powerpc/contrib/ncurses/tack/tack.h#2 integrate .. //depot/projects/powerpc/contrib/ncurses/tar-copy.sh#2 integrate .. //depot/projects/powerpc/contrib/ncurses/test/Makefile.in#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/README#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/blue.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/bs.6#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/bs.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/cardfile.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/cardfile.dat#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/configure#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/configure.in#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/ditto.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/dots.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/filter.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/firework.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/firstlast.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/gdc.6#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/gdc.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/hanoi.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/hashtest.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/keynames.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/knight.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/lrtest.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/modules#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/ncurses.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/ncurses_tst.hin#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/newdemo.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/railroad.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/rain.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/tclock.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/test.priv.h#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/testaddch.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/testcurs.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/testscanw.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/tracemunch#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/view.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/worm.c#2 delete .. //depot/projects/powerpc/contrib/ncurses/test/xmas.c#2 delete .. //depot/projects/powerpc/etc/defaults/rc.conf#2 integrate .. //depot/projects/powerpc/etc/rc.d/abi#2 integrate .. //depot/projects/powerpc/etc/rc.d/accounting#2 integrate .. //depot/projects/powerpc/etc/rc.d/archdep#2 integrate .. //depot/projects/powerpc/etc/rc.d/atm1#2 integrate .. //depot/projects/powerpc/etc/rc.d/auto_linklocal#2 integrate .. //depot/projects/powerpc/etc/rc.d/bluetooth#2 integrate .. //depot/projects/powerpc/etc/rc.d/bootconf.sh#2 integrate .. //depot/projects/powerpc/etc/rc.d/bridge#2 integrate .. //depot/projects/powerpc/etc/rc.d/geli#2 integrate .. //depot/projects/powerpc/etc/rc.d/hcsecd#2 integrate .. //depot/projects/powerpc/etc/rc.d/ip6fw#2 integrate .. //depot/projects/powerpc/etc/rc.d/ipfilter#2 integrate .. //depot/projects/powerpc/etc/rc.d/ipfw#2 integrate .. //depot/projects/powerpc/etc/rc.d/ipnat#2 integrate .. //depot/projects/powerpc/etc/rc.d/jail#2 integrate .. //depot/projects/powerpc/etc/rc.d/ldconfig#2 integrate .. //depot/projects/powerpc/etc/rc.d/lpd#2 integrate .. //depot/projects/powerpc/etc/rc.d/mdconfig#2 integrate .. //depot/projects/powerpc/etc/rc.d/mdconfig2#2 integrate .. //depot/projects/powerpc/etc/rc.d/mountcritremote#2 integrate .. //depot/projects/powerpc/etc/rc.d/moused#2 integrate .. //depot/projects/powerpc/etc/rc.d/natd#2 integrate .. //depot/projects/powerpc/etc/rc.d/netif#2 integrate .. //depot/projects/powerpc/etc/rc.d/nfsclient#2 integrate .. //depot/projects/powerpc/etc/rc.d/nfsserver#2 integrate .. //depot/projects/powerpc/etc/rc.d/nsswitch#2 integrate .. //depot/projects/powerpc/etc/rc.d/pf#2 integrate .. //depot/projects/powerpc/etc/rc.d/pflog#2 integrate .. //depot/projects/powerpc/etc/rc.d/pfsync#2 integrate .. //depot/projects/powerpc/etc/rc.d/power_profile#2 integrate .. //depot/projects/powerpc/etc/rc.d/pppoed#2 integrate .. //depot/projects/powerpc/etc/rc.d/quota#2 integrate .. //depot/projects/powerpc/etc/rc.d/sdpd#2 integrate .. //depot/projects/powerpc/etc/rc.d/syscons#2 integrate .. //depot/projects/powerpc/etc/rc.d/syslogd#2 integrate .. //depot/projects/powerpc/etc/rc.d/ugidfw#2 integrate .. //depot/projects/powerpc/etc/rc.d/var#2 integrate .. //depot/projects/powerpc/etc/rc.d/ypbind#2 integrate .. //depot/projects/powerpc/etc/rc.d/yppasswdd#2 integrate .. //depot/projects/powerpc/etc/rc.d/ypserv#2 integrate .. //depot/projects/powerpc/etc/rc.d/ypset#2 integrate .. //depot/projects/powerpc/etc/rc.d/ypupdated#2 integrate .. //depot/projects/powerpc/etc/rc.d/ypxfrd#2 integrate .. //depot/projects/powerpc/etc/rc.firewall#2 integrate .. //depot/projects/powerpc/etc/rc.subr#2 integrate .. //depot/projects/powerpc/etc/snmpd.config#2 integrate .. //depot/projects/powerpc/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/powerpc/games/fortune/datfiles/fortunes-o.real#2 integrate .. //depot/projects/powerpc/games/fortune/datfiles/fortunes.sp.ok#2 integrate .. //depot/projects/powerpc/games/fortune/datfiles/fortunes2-o#2 integrate .. //depot/projects/powerpc/games/fortune/datfiles/zippy#2 integrate .. //depot/projects/powerpc/gnu/lib/libreadline/Makefile.inc#2 integrate .. //depot/projects/powerpc/gnu/lib/libreadline/config.h#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/man/apropos/apropos.man#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/man/man/man.man#2 integrate .. //depot/projects/powerpc/gnu/usr.bin/man/manpath/manpath.man#2 integrate .. //depot/projects/powerpc/include/mqueue.h#2 integrate .. //depot/projects/powerpc/lib/Makefile#2 integrate .. //depot/projects/powerpc/lib/libarchive/COPYING#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive.h.in#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_check_magic.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_entry.3#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_entry.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_entry.h#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_platform.h#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_private.h#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read.3#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_data_into_buffer.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_data_into_fd.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_extract.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_open_fd.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_open_file.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_open_filename.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_open_memory.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_compression_all.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_compression_compress.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_compression_none.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_all.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_cpio.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_iso9660.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_tar.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_read_support_format_zip.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_string.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_string.h#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_string_sprintf.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_util.3#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_util.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write.3#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_open_fd.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_open_file.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_open_filename.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_open_memory.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_set_compression_bzip2.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_set_compression_gzip.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_set_compression_none.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_set_format.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_set_format_by_name.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_set_format_cpio.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_set_format_pax.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_set_format_shar.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/archive_write_set_format_ustar.c#2 integrate .. //depot/projects/powerpc/lib/libarchive/config_freebsd.h#2 integrate .. //depot/projects/powerpc/lib/libarchive/libarchive-formats.5#2 integrate .. //depot/projects/powerpc/lib/libarchive/libarchive.3#2 integrate .. //depot/projects/powerpc/lib/libarchive/tar.5#2 integrate .. //depot/projects/powerpc/lib/libc/amd64/SYS.h#2 integrate .. //depot/projects/powerpc/lib/libc/amd64/gd_qnan.h#1 branch .. //depot/projects/powerpc/lib/libc/amd64/gen/_setjmp.S#2 integrate .. //depot/projects/powerpc/lib/libc/amd64/gen/ldexp.c#2 integrate .. //depot/projects/powerpc/lib/libc/amd64/gen/modf.S#2 integrate .. //depot/projects/powerpc/lib/libc/amd64/gen/setjmp.S#2 integrate .. //depot/projects/powerpc/lib/libc/amd64/gen/sigsetjmp.S#2 integrate .. //depot/projects/powerpc/lib/libc/amd64/sys/brk.S#2 integrate .. //depot/projects/powerpc/lib/libc/amd64/sys/cerror.S#2 integrate .. //depot/projects/powerpc/lib/libc/amd64/sys/exect.S#2 integrate .. //depot/projects/powerpc/lib/libc/amd64/sys/pipe.S#2 integrate .. //depot/projects/powerpc/lib/libc/amd64/sys/ptrace.S#2 integrate .. //depot/projects/powerpc/lib/libc/amd64/sys/reboot.S#2 integrate .. //depot/projects/powerpc/lib/libc/amd64/sys/sbrk.S#2 integrate .. //depot/projects/powerpc/lib/libc/amd64/sys/setlogin.S#2 integrate .. //depot/projects/powerpc/lib/libc/amd64/sys/sigreturn.S#2 integrate .. //depot/projects/powerpc/lib/libc/amd64/sys/vfork.S#2 integrate .. //depot/projects/powerpc/lib/libc/arm/gd_qnan.h#1 branch .. //depot/projects/powerpc/lib/libc/compat-43/creat.2#2 integrate .. //depot/projects/powerpc/lib/libc/compat-43/creat.c#2 integrate .. //depot/projects/powerpc/lib/libc/compat-43/gethostid.3#2 integrate .. //depot/projects/powerpc/lib/libc/compat-43/gethostid.c#2 integrate .. //depot/projects/powerpc/lib/libc/compat-43/getwd.c#2 integrate .. //depot/projects/powerpc/lib/libc/compat-43/killpg.2#2 integrate .. //depot/projects/powerpc/lib/libc/compat-43/killpg.c#2 integrate .. //depot/projects/powerpc/lib/libc/compat-43/sethostid.c#2 integrate .. //depot/projects/powerpc/lib/libc/compat-43/setpgrp.c#2 integrate .. //depot/projects/powerpc/lib/libc/compat-43/setrgid.c#2 integrate .. //depot/projects/powerpc/lib/libc/compat-43/setruid.3#2 integrate .. //depot/projects/powerpc/lib/libc/compat-43/setruid.c#2 integrate .. //depot/projects/powerpc/lib/libc/compat-43/sigcompat.c#2 integrate .. //depot/projects/powerpc/lib/libc/compat-43/sigpause.2#2 integrate .. //depot/projects/powerpc/lib/libc/compat-43/sigsetmask.2#2 integrate .. //depot/projects/powerpc/lib/libc/compat-43/sigvec.2#2 integrate .. //depot/projects/powerpc/lib/libc/db/btree/bt_close.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/btree/bt_conv.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/btree/bt_debug.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/btree/bt_delete.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/btree/bt_get.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/btree/bt_open.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/btree/bt_overflow.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/btree/bt_page.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/btree/bt_put.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/btree/bt_search.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/btree/bt_seq.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/btree/bt_split.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/btree/bt_utils.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/btree/btree.h#2 integrate .. //depot/projects/powerpc/lib/libc/db/btree/extern.h#2 integrate .. //depot/projects/powerpc/lib/libc/db/db/db.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/hash/extern.h#2 integrate .. //depot/projects/powerpc/lib/libc/db/hash/hash.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/hash/hash.h#2 integrate .. //depot/projects/powerpc/lib/libc/db/hash/hash_bigkey.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/hash/hash_buf.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/hash/hash_func.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/hash/hash_log2.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/hash/hash_page.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/hash/ndbm.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/hash/page.h#2 integrate .. //depot/projects/powerpc/lib/libc/db/man/btree.3#2 integrate .. //depot/projects/powerpc/lib/libc/db/man/dbopen.3#2 integrate .. //depot/projects/powerpc/lib/libc/db/man/hash.3#2 integrate .. //depot/projects/powerpc/lib/libc/db/man/mpool.3#2 integrate .. //depot/projects/powerpc/lib/libc/db/man/recno.3#2 integrate .. //depot/projects/powerpc/lib/libc/db/mpool/mpool.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/recno/extern.h#2 integrate .. //depot/projects/powerpc/lib/libc/db/recno/rec_close.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/recno/rec_delete.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/recno/rec_get.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/recno/rec_open.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/recno/rec_put.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/recno/rec_search.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/recno/rec_seq.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/recno/rec_utils.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/recno/recno.h#2 integrate .. //depot/projects/powerpc/lib/libc/db/test/btree.tests/main.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/test/dbtest.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/test/hash.tests/driver2.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/test/hash.tests/tcreat3.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/test/hash.tests/tdel.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/test/hash.tests/thash4.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/test/hash.tests/tread2.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/test/hash.tests/tseq.c#2 integrate .. //depot/projects/powerpc/lib/libc/db/test/hash.tests/tverify.c#2 integrate .. //depot/projects/powerpc/lib/libc/gdtoa/_hdtoa.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/__xuname.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/_spinlock_stub.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/alarm.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/alarm.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/assert.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/clock.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/clock.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/closedir.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/confstr.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/confstr.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/crypt.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/ctermid.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/ctermid.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/daemon.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/daemon.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/devname.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/devname.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/directory.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/disklabel.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/err.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/err.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/errlst.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/exec.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/exec.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/fnmatch.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/fnmatch.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/frexp.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/fstab.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/fts.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/fts.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getbootfile.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getbootfile.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getbsize.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getbsize.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getcap.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getcap.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getcwd.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getcwd.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getdiskbyname.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getdomainname.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getdomainname.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getfsent.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getgrent.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getgrouplist.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getgrouplist.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/gethostname.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/gethostname.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getloadavg.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getloadavg.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getlogin.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getmntinfo.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getmntinfo.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getnetgrent.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getnetgrent.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getosreldate.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getpagesize.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getpagesize.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getpass.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getpwent.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getttyent.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getttyent.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getusershell.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getusershell.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getvfsbyname.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/getvfsbyname.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/glob.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/glob.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/initgroups.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/initgroups.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/isatty.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/ldexp.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/modf.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/nice.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/nice.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/nlist.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/nlist.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/opendir.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/pause.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/pause.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/popen.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/popen.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/psignal.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/psignal.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/pw_scan.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/pw_scan.h#2 integrate .. //depot/projects/powerpc/lib/libc/gen/pwcache.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/pwcache.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/raise.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/raise.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/readdir.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/rewinddir.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/scandir.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/scandir.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/seekdir.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/setdomainname.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/sethostname.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/setjmp.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/setjmperr.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/setmode.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/setmode.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/siginterrupt.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/siginterrupt.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/siglist.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/signal.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/signal.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/sigsetops.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/sigsetops.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/sleep.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/sleep.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/stringlist.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/strtofflags.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/strtofflags.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/sysconf.3#3 integrate .. //depot/projects/powerpc/lib/libc/gen/sysconf.c#3 integrate .. //depot/projects/powerpc/lib/libc/gen/sysctl.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/sysctl.c#2 integrate .. //depot/projects/powerpc/lib/libc/gen/syslog.3#2 integrate .. //depot/projects/powerpc/lib/libc/gen/syslog.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 21 09:04:14 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C34F916A405; Sun, 21 Jan 2007 09:04:14 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 98DD016A401 for ; Sun, 21 Jan 2007 09:04:14 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 71C9B13C457 for ; Sun, 21 Jan 2007 09:04:14 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0L94Ebq072756 for ; Sun, 21 Jan 2007 09:04:14 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0L94EwL072749 for perforce@freebsd.org; Sun, 21 Jan 2007 09:04:14 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 21 Jan 2007 09:04:14 GMT Message-Id: <200701210904.l0L94EwL072749@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 113244 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 09:04:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=113244 Change 113244 by sephe@sephe_zealot:sam_wifi on 2007/01/21 09:03:36 Nuke duplicated ieee80211_crypto_attach(). Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211.c#38 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211.c#38 (text+ko) ==== @@ -216,8 +216,6 @@ bpfattach2(ifp, DLT_IEEE802_11, sizeof(struct ieee80211_frame_addr4), &ic->ic_rawbpf); - ieee80211_crypto_attach(ic); - /* * Fill in 802.11 available channel set, mark all * available channels as active, and pick a default From owner-p4-projects@FreeBSD.ORG Sun Jan 21 10:02:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB3A316A51D; Sun, 21 Jan 2007 10:02:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 71DF916A4EB for ; Sun, 21 Jan 2007 10:02:28 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6279D13C45A for ; Sun, 21 Jan 2007 10:02:28 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0LA2Scf082850 for ; Sun, 21 Jan 2007 10:02:28 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LA2Rwx082844 for perforce@freebsd.org; Sun, 21 Jan 2007 10:02:27 GMT (envelope-from zec@FreeBSD.org) Date: Sun, 21 Jan 2007 10:02:27 GMT Message-Id: <200701211002.l0LA2Rwx082844@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 113246 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 10:02:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=113246 Change 113246 by zec@zec_tpx32 on 2007/01/21 10:02:25 Provide access to the virtualized "ifnet" symbol in several linux compatibility routines. Affected files ... .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#2 edit .. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#2 edit Differences ... ==== //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#2 (text+ko) ==== @@ -42,6 +42,9 @@ #include __FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.101 2006/11/27 21:10:55 jkim Exp $"); +#include "opt_compat.h" +#include "opt_vimage.h" + #include #include #include @@ -68,7 +71,9 @@ #include #include #include +#include +#include #include #include @@ -85,7 +90,6 @@ #include #endif /* __i386__ || __amd64__ */ -#include "opt_compat.h" #ifdef COMPAT_LINUX32 /* XXX */ #include #else @@ -902,6 +906,7 @@ static int linprocfs_donetdev(PFS_FILL_ARGS) { + INIT_VNET_NET(curthread->td_vimage->v_vnetb); char ifname[16]; /* XXX LINUX_IFNAMSIZ */ struct ifnet *ifp; @@ -911,7 +916,7 @@ "bytes packets errs drop fifo frame compressed"); IFNET_RLOCK(); - TAILQ_FOREACH(ifp, &ifnet, if_link) { + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { linux_ifname(ifp, ifname, sizeof ifname); sbuf_printf(sb, "%6.6s:", ifname); sbuf_printf(sb, "%8lu %7lu %4lu %4lu %4lu %5lu %10lu %9lu ", ==== //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#2 (text+ko) ==== @@ -29,6 +29,9 @@ #include __FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.137 2006/07/06 21:42:36 jhb Exp $"); +#include "opt_vimage.h" +#include "opt_compat.h" + #include #include #include @@ -56,12 +59,13 @@ #include #include #include +#include + +#include #include #include #include -#include "opt_compat.h" - #ifdef COMPAT_LINUX32 #include #include @@ -2028,6 +2032,7 @@ int linux_ifname(struct ifnet *ifp, char *buffer, size_t buflen) { + INIT_VNET_NET(ifp->if_vnetb); struct ifnet *ifscan; int ethno; @@ -2038,7 +2043,7 @@ /* Determine the (relative) unit number for ethernet interfaces */ ethno = 0; IFNET_RLOCK(); - TAILQ_FOREACH(ifscan, &ifnet, if_link) { + TAILQ_FOREACH(ifscan, &V_ifnet, if_link) { if (ifscan == ifp) { IFNET_RUNLOCK(); return (snprintf(buffer, buflen, "eth%d", ethno)); @@ -2061,6 +2066,7 @@ static struct ifnet * ifname_linux_to_bsd(const char *lxname, char *bsdname) { + INIT_VNET_NET(curthread->td_vimage->v_vnetb); struct ifnet *ifp; int len, unit; char *ep; @@ -2077,7 +2083,7 @@ index = 0; is_eth = (len == 3 && !strncmp(lxname, "eth", len)) ? 1 : 0; IFNET_RLOCK(); - TAILQ_FOREACH(ifp, &ifnet, if_link) { + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { /* * Allow Linux programs to use FreeBSD names. Don't presume * we never have an interface named "eth", so don't make @@ -2101,6 +2107,7 @@ static int linux_ifconf(struct thread *td, struct ifconf *uifc) { + INIT_VNET_NET(td->td_vimage->v_vnetb); #ifdef COMPAT_LINUX32 struct l_ifconf ifc; #else @@ -2121,7 +2128,7 @@ /* handle the 'request buffer size' case */ if (ifc.ifc_buf == PTROUT(NULL)) { ifc.ifc_len = 0; - TAILQ_FOREACH(ifp, &ifnet, if_link) { + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { struct sockaddr *sa = ifa->ifa_addr; if (sa->sa_family == AF_INET) @@ -2148,7 +2155,7 @@ /* Return all AF_INET addresses of all interfaces */ IFNET_RLOCK(); /* could sleep XXX */ - TAILQ_FOREACH(ifp, &ifnet, if_link) { + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { int addrs = 0; bzero(&ifr, sizeof(ifr)); From owner-p4-projects@FreeBSD.ORG Sun Jan 21 10:24:58 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 50E6516A404; Sun, 21 Jan 2007 10:24:58 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 17BCE16A402 for ; Sun, 21 Jan 2007 10:24:58 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 093CC13C455 for ; Sun, 21 Jan 2007 10:24:58 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0LAOvnx087962 for ; Sun, 21 Jan 2007 10:24:57 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LAOvAp087959 for perforce@freebsd.org; Sun, 21 Jan 2007 10:24:57 GMT (envelope-from zec@FreeBSD.org) Date: Sun, 21 Jan 2007 10:24:57 GMT Message-Id: <200701211024.l0LAOvAp087959@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 113247 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 10:24:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=113247 Change 113247 by zec@zec_tpx32 on 2007/01/21 10:24:33 The diskless NFS booting process can operate only in the default vnet -> always resolve V_inet in vnetb_0. Affected files ... .. //depot/projects/vimage/src/sys/nfsclient/nfs_diskless.c#3 edit Differences ... ==== //depot/projects/vimage/src/sys/nfsclient/nfs_diskless.c#3 (text+ko) ==== @@ -36,14 +36,17 @@ __FBSDID("$FreeBSD: src/sys/nfsclient/nfs_diskless.c,v 1.17 2006/12/06 02:15:25 sam Exp $"); #include "opt_bootp.h" +#include "opt_vimage.h" #include #include #include #include #include +#include +#include -#include +#include #include #include #include @@ -148,6 +151,7 @@ void nfs_setup_diskless(void) { + INIT_VNET_NET(&vnetb_0); struct nfs_diskless *nd = &nfs_diskless; struct ifnet *ifp; struct ifaddr *ifa; @@ -176,7 +180,7 @@ } ifa = NULL; IFNET_RLOCK(); - TAILQ_FOREACH(ifp, &ifnet, if_link) { + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { if (ifa->ifa_addr->sa_family == AF_LINK) { sdl = (struct sockaddr_dl *)ifa->ifa_addr; From owner-p4-projects@FreeBSD.ORG Sun Jan 21 11:33:22 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6481516A40F; Sun, 21 Jan 2007 11:33:22 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3F60E16A400 for ; Sun, 21 Jan 2007 11:33:22 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3098F13C45B for ; Sun, 21 Jan 2007 11:33:22 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0LBXMH7099901 for ; Sun, 21 Jan 2007 11:33:22 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LBXLmg099897 for perforce@freebsd.org; Sun, 21 Jan 2007 11:33:21 GMT (envelope-from zec@FreeBSD.org) Date: Sun, 21 Jan 2007 11:33:21 GMT Message-Id: <200701211133.l0LBXLmg099897@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 113248 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 11:33:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=113248 Change 113248 by zec@zec_tca51 on 2007/01/21 11:33:03 Initial attempt to make the NFS client code aware of stack virtualization. So far NFS mounts work from the default vnet, but not from the others. This problem is probably related to the fact that nfs_connect() always provides &thread0, which is bound to the default stack instance, as an argument to socreate(). As a consequence the NFS socket gets open in a wrong stack I guess... This needs more thought... Affected files ... .. //depot/projects/vimage/src/sys/kern/sys_socket.c#3 edit .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#6 edit .. //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#4 edit .. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#2 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/sys_socket.c#3 (text+ko) ==== @@ -112,13 +112,11 @@ int error; NET_LOCK_GIANT(); - CURVNETB_SET(so->so_vnetb); #ifdef MAC SOCK_LOCK(so); error = mac_check_socket_send(active_cred, so); SOCK_UNLOCK(so); if (error) { - CURVNETB_RESTORE(); NET_UNLOCK_GIANT(); return (error); } @@ -129,7 +127,6 @@ psignal(uio->uio_td->td_proc, SIGPIPE); PROC_UNLOCK(uio->uio_td->td_proc); } - CURVNETB_RESTORE(); NET_UNLOCK_GIANT(); return (error); } @@ -323,9 +320,7 @@ fp->f_data = NULL; if (so) { - CURVNETB_SET(so->so_vnetb); error = soclose(so); - CURVNETB_RESTORE(); } NET_UNLOCK_GIANT(); return (error); ==== //depot/projects/vimage/src/sys/kern/uipc_socket.c#6 (text+ko) ==== @@ -508,8 +508,12 @@ struct sockaddr *nam; struct thread *td; { + int error; - return ((*so->so_proto->pr_usrreqs->pru_bind)(so, nam, td)); + CURVNETB_SET(so->so_vnetb); + error = (*so->so_proto->pr_usrreqs->pru_bind)(so, nam, td); + CURVNETB_RESTORE(); + return error; } /* @@ -667,6 +671,7 @@ KASSERT(!(so->so_state & SS_NOFDREF), ("soclose: SS_NOFDREF on enter")); + CURVNETB_SET(so->so_vnetb); funsetown(&so->so_sigio); if (so->so_state & SS_ISCONNECTED) { if ((so->so_state & SS_ISDISCONNECTING) == 0) { @@ -718,6 +723,7 @@ KASSERT((so->so_state & SS_NOFDREF) == 0, ("soclose: NOFDREF")); so->so_state |= SS_NOFDREF; sorele(so); + CURVNETB_RESTORE(); return (error); } @@ -1344,8 +1350,10 @@ KASSERT(so->so_proto->pr_usrreqs->pru_sosend != sosend, ("sosend: protocol calls sosend")); + CURVNETB_SET(so->so_vnetb); error = so->so_proto->pr_usrreqs->pru_sosend(so, addr, uio, top, control, flags, td); + CURVNETB_RESTORE(); return (error); } ==== //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#4 (text+ko) ==== @@ -238,7 +238,6 @@ if (error) goto done2; so = fp->f_data; - CURVNETB_SET(so->so_vnetb); #ifdef MAC SOCK_LOCK(so); error = mac_check_socket_bind(td->td_ucred, so, sa); @@ -251,7 +250,6 @@ done1: #endif fdrop(fp, td); - CURVNETB_RESTORE(); done2: NET_UNLOCK_GIANT(); return (error); @@ -800,7 +798,6 @@ if (error) goto bad2; so = (struct socket *)fp->f_data; - CURVNETB_SET(so->so_vnetb); #ifdef MAC SOCK_LOCK(so); @@ -852,7 +849,6 @@ #endif bad: fdrop(fp, td); - CURVNETB_RESTORE(); bad2: NET_UNLOCK_GIANT(); return (error); ==== //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#2 (text+ko) ==== @@ -40,6 +40,7 @@ */ #include "opt_inet.h" +#include "opt_vimage.h" #include #include @@ -60,6 +61,7 @@ #include #include #include +#include #include #include @@ -80,6 +82,8 @@ #include #include + +#include #include #include @@ -1338,6 +1342,7 @@ static int nfs_create(struct vop_create_args *ap) { + INIT_VNET_INET(curvnetb); struct vnode *dvp = ap->a_dvp; struct vattr *vap = ap->a_vap; struct componentname *cnp = ap->a_cnp; @@ -1376,8 +1381,8 @@ *tl = txdr_unsigned(NFSV3CREATE_EXCLUSIVE); tl = nfsm_build(u_int32_t *, NFSX_V3CREATEVERF); #ifdef INET - if (!TAILQ_EMPTY(&in_ifaddrhead)) - *tl++ = IA_SIN(TAILQ_FIRST(&in_ifaddrhead))->sin_addr.s_addr; + if (!TAILQ_EMPTY(&V_in_ifaddrhead)) + *tl++ = IA_SIN(TAILQ_FIRST(&V_in_ifaddrhead))->sin_addr.s_addr; else #endif *tl++ = create_verf; From owner-p4-projects@FreeBSD.ORG Sun Jan 21 11:34:24 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BE3716A402; Sun, 21 Jan 2007 11:34:24 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1AE2E16A400 for ; Sun, 21 Jan 2007 11:34:24 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E8A9C13C45B for ; Sun, 21 Jan 2007 11:34:23 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0LBYNID000108 for ; Sun, 21 Jan 2007 11:34:23 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LBYNDA000105 for perforce@freebsd.org; Sun, 21 Jan 2007 11:34:23 GMT (envelope-from zec@FreeBSD.org) Date: Sun, 21 Jan 2007 11:34:23 GMT Message-Id: <200701211134.l0LBYNDA000105@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 113249 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 11:34:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=113249 Change 113249 by zec@zec_tca51 on 2007/01/21 11:34:03 Remove "NFSCLIENT" from the list of unsupported compile-time options. Affected files ... .. //depot/projects/vimage/src/sys/i386/conf/VIMAGE#5 edit Differences ... ==== //depot/projects/vimage/src/sys/i386/conf/VIMAGE#5 (text+ko) ==== @@ -14,6 +14,5 @@ # from the configuration for now. # -nooptions NFSCLIENT nooptions NFS_ROOT nodevice gif From owner-p4-projects@FreeBSD.ORG Sun Jan 21 14:45:24 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF3B116A409; Sun, 21 Jan 2007 14:45:23 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C96CB16A405 for ; Sun, 21 Jan 2007 14:45:23 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BAA0213C45B for ; Sun, 21 Jan 2007 14:45:23 +0000 (UTC) (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 l0LEjN6p047517 for ; Sun, 21 Jan 2007 14:45:23 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LEjNCh047514 for perforce@freebsd.org; Sun, 21 Jan 2007 14:45:23 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 21 Jan 2007 14:45:23 GMT Message-Id: <200701211445.l0LEjNCh047514@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 113253 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 14:45:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=113253 Change 113253 by rdivacky@rdivacky_witten on 2007/01/21 14:45:12 user_desc structure is differnt on amd64 running in i386 mode. Sync that. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#14 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#14 (text+ko) ==== @@ -768,6 +768,7 @@ l_uint limit_in_pages:1; l_uint seg_not_present:1; l_uint useable:1; + l_uint lm:1; }; struct l_desc_struct { @@ -791,6 +792,7 @@ #define ENTRY_B_USEABLE 20 #define ENTRY_B_SEG32BIT 22 #define ENTRY_B_LIMIT 23 +#define ENTRY_B_LONGMODE 21 #define LDT_entry_b(info) \ (((info)->base_addr & 0xff000000) | \ @@ -811,7 +813,8 @@ (info)->read_exec_only == 1 && \ (info)->seg_32bit == 0 && \ (info)->limit_in_pages == 0 && \ - (info)->useable == 0 ) + (info)->useable == 0 && \ + (info)->lm == 0) /* macros for converting segments, they do the same as those in arch/i386/kernel/process.c */ #define GET_BASE(desc) ( \ @@ -829,6 +832,7 @@ #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 GET_LONGMODE(desc) (((desc)->b >> ENTRY_B_LONGMODE) & 1) #define LINUX_CLOCK_REALTIME 0 #define LINUX_CLOCK_MONOTONIC 1 From owner-p4-projects@FreeBSD.ORG Sun Jan 21 15:02:46 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AAC516A406; Sun, 21 Jan 2007 15:02:46 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 556FE16A400 for ; Sun, 21 Jan 2007 15:02:46 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4721313C441 for ; Sun, 21 Jan 2007 15:02:46 +0000 (UTC) (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 l0LF2kGf050509 for ; Sun, 21 Jan 2007 15:02:46 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LF2jnK050505 for perforce@freebsd.org; Sun, 21 Jan 2007 15:02:45 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 21 Jan 2007 15:02:45 GMT Message-Id: <200701211502.l0LF2jnK050505@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 113254 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 15:02:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=113254 Change 113254 by rdivacky@rdivacky_witten on 2007/01/21 15:02:24 Print the long mode flag in set_thread_area. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#27 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#27 (text+ko) ==== @@ -1248,7 +1248,7 @@ #ifdef DEBUG if (ldebug(set_thread_area)) - printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, %i, %i, %i\n"), + printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, %i, %i, %i, %i\n"), info.entry_number, info.base_addr, info.limit, @@ -1257,7 +1257,8 @@ info.read_exec_only, info.limit_in_pages, info.seg_not_present, - info.useable); + info.useable, + info.lm); #endif idx = info.entry_number; From owner-p4-projects@FreeBSD.ORG Sun Jan 21 15:13:01 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2932316A488; Sun, 21 Jan 2007 15:13:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0179F16A484 for ; Sun, 21 Jan 2007 15:13:01 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E561813C43E for ; Sun, 21 Jan 2007 15:13:00 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0LFD0Mu053496 for ; Sun, 21 Jan 2007 15:13:00 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LFCxJF053492 for perforce@freebsd.org; Sun, 21 Jan 2007 15:12:59 GMT (envelope-from piso@freebsd.org) Date: Sun, 21 Jan 2007 15:12:59 GMT Message-Id: <200701211512.l0LFCxJF053492@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 113255 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 15:13:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=113255 Change 113255 by piso@piso_newluxor on 2007/01/21 15:12:50 IFC@113250 Affected files ... .. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_machdep.c#8 integrate .. //depot/projects/soc2006/intr_filter/arm/at91/uart_dev_at91usart.c#5 integrate .. //depot/projects/soc2006/intr_filter/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/soc2006/intr_filter/compat/linprocfs/linprocfs.c#8 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_emul.c#7 integrate .. //depot/projects/soc2006/intr_filter/compat/linux/linux_file.c#6 integrate .. //depot/projects/soc2006/intr_filter/conf/files.sparc64#5 integrate .. //depot/projects/soc2006/intr_filter/conf/options#12 integrate .. //depot/projects/soc2006/intr_filter/conf/options.sun4v#2 integrate .. //depot/projects/soc2006/intr_filter/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/bce/if_bce.c#11 integrate .. //depot/projects/soc2006/intr_filter/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/dpt/dpt.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/dpt/dpt_eisa.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/dpt/dpt_scsi.c#4 integrate .. //depot/projects/soc2006/intr_filter/dev/fb/fbreg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp.c#12 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_freebsd.c#9 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_freebsd.h#7 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_target.c#5 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_target.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/isp_tpublic.h#4 integrate .. //depot/projects/soc2006/intr_filter/dev/isp/ispvar.h#7 integrate .. //depot/projects/soc2006/intr_filter/dev/le/if_le_cbus.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/le/if_le_isa.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/le/if_le_lebuffer.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/le/if_le_ledma.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/le/if_le_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/le/lance.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/le/lebuffer_sbus.c#1 branch .. //depot/projects/soc2006/intr_filter/dev/mc146818/mc146818reg.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/mii.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/mii/ukphy.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/pci/pcireg.h#5 integrate .. //depot/projects/soc2006/intr_filter/dev/si/si.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/sound/sbus/cs4231.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/uart/uart_cpu.h#2 integrate .. //depot/projects/soc2006/intr_filter/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/uart/uart_dev_sab82532.c#2 integrate .. //depot/projects/soc2006/intr_filter/dev/uart/uart_dev_z8530.c#3 integrate .. //depot/projects/soc2006/intr_filter/dev/uart/uart_kbd_sun.c#4 integrate .. //depot/projects/soc2006/intr_filter/i386/linux/linux_machdep.c#7 integrate .. //depot/projects/soc2006/intr_filter/kern/sched_ule.c#9 integrate .. //depot/projects/soc2006/intr_filter/modules/le/Makefile#2 integrate .. //depot/projects/soc2006/intr_filter/netgraph/ng_ppp.c#3 integrate .. //depot/projects/soc2006/intr_filter/sparc64/include/bus.h#3 integrate .. //depot/projects/soc2006/intr_filter/sparc64/include/cache.h#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/include/frame.h#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/include/fsr.h#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/include/intr_machdep.h#4 integrate .. //depot/projects/soc2006/intr_filter/sparc64/include/pcb.h#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/include/tsb.h#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/isa/isa.c#3 integrate .. //depot/projects/soc2006/intr_filter/sparc64/pci/ofw_pci_if.m#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/pci/psycho.c#10 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/bus_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/genassym.c#6 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/interrupt.S#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/mp_exception.S#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/mp_locore.S#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/ofw_machdep.c#3 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/support.S#4 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/swtch.S#2 integrate .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/upa.c#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/include/bus.h#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/include/frame.h#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/include/fsr.h#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/include/intr_machdep.h#3 integrate .. //depot/projects/soc2006/intr_filter/sun4v/include/pcb.h#3 integrate .. //depot/projects/soc2006/intr_filter/sun4v/include/utrap.h#3 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/bus_machdep.c#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/exception.S#5 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/hv_pci.c#3 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/interrupt.S#4 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/mp_locore.S#3 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/support.S#4 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/swtch.S#2 integrate .. //depot/projects/soc2006/intr_filter/sun4v/sun4v/wbuf.S#4 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_alloc.c#5 integrate .. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_snapshot.c#4 integrate .. //depot/projects/soc2006/intr_filter/ufs/ufs/quota.h#2 integrate .. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_quota.c#4 integrate Differences ... ==== //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_machdep.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.26 2007/01/14 16:20:37 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.27 2007/01/20 14:58:59 netchild Exp $"); #include #include @@ -453,14 +453,21 @@ linux_fork(struct thread *td, struct linux_fork_args *args) { int error; + struct proc *p2; + struct thread *td2; #ifdef DEBUG if (ldebug(fork)) printf(ARGS(fork, "")); #endif - if ((error = fork(td, (struct fork_args *)args)) != 0) + if ((error = fork1(td, RFFDG | RFPROC | RFSTOPPED, 0, &p2)) != 0) return (error); + + if (error == 0) { + td->td_retval[0] = p2->p_pid; + td->td_retval[1] = 0; + } if (td->td_retval[1] == 1) td->td_retval[0] = 0; @@ -468,6 +475,14 @@ if (error) return (error); + td2 = FIRST_THREAD_IN_PROC(p2); + + /* make it run */ + mtx_lock_spin(&sched_lock); + TD_SET_CAN_RUN(td2); + setrunqueue(td2, SRQ_BORING); + mtx_unlock_spin(&sched_lock); + return (0); } @@ -476,6 +491,7 @@ { int error; struct proc *p2; + struct thread *td2; #ifdef DEBUG if (ldebug(vfork)) @@ -483,7 +499,7 @@ #endif /* exclude RFPPWAIT */ - if ((error = fork1(td, RFFDG | RFPROC | RFMEM, 0, &p2)) != 0) + if ((error = fork1(td, RFFDG | RFPROC | RFMEM | RFSTOPPED, 0, &p2)) != 0) return (error); if (error == 0) { td->td_retval[0] = p2->p_pid; @@ -495,12 +511,25 @@ error = linux_proc_init(td, td->td_retval[0], 0); if (error) return (error); + + PROC_LOCK(p2); + p2->p_flag |= P_PPWAIT; + PROC_UNLOCK(p2); + + td2 = FIRST_THREAD_IN_PROC(p2); + + /* make it run */ + mtx_lock_spin(&sched_lock); + TD_SET_CAN_RUN(td2); + setrunqueue(td2, SRQ_BORING); + mtx_unlock_spin(&sched_lock); + /* wait for the children to exit, ie. emulate vfork */ PROC_LOCK(p2); - p2->p_flag |= P_PPWAIT; while (p2->p_flag & P_PPWAIT) msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); PROC_UNLOCK(p2); + return (0); } @@ -632,6 +661,11 @@ printf(LMSG("clone: successful rfork to %ld, stack %p sig = %d"), (long)p2->p_pid, args->stack, exit_signal); #endif + if (args->flags & CLONE_VFORK) { + PROC_LOCK(p2); + p2->p_flag |= P_PPWAIT; + PROC_UNLOCK(p2); + } /* * Make this runnable after we are finished with it. @@ -647,7 +681,6 @@ if (args->flags & CLONE_VFORK) { /* wait for the children to exit, ie. emulate vfork */ PROC_LOCK(p2); - p2->p_flag |= P_PPWAIT; while (p2->p_flag & P_PPWAIT) msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); PROC_UNLOCK(p2); ==== //depot/projects/soc2006/intr_filter/arm/at91/uart_dev_at91usart.c#5 (text) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.10 2006/12/07 00:24:15 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/uart_dev_at91usart.c,v 1.11 2007/01/18 22:01:19 marius Exp $"); #include "opt_comconsole.h" @@ -94,7 +94,7 @@ static void at91_usart_init(struct uart_bas *bas, int, int, int, int); static void at91_usart_term(struct uart_bas *bas); static void at91_usart_putc(struct uart_bas *bas, int); -static int at91_usart_poll(struct uart_bas *bas); +static int at91_usart_rxready(struct uart_bas *bas); static int at91_usart_getc(struct uart_bas *bas, struct mtx *mtx); extern SLIST_HEAD(uart_devinfo_list, uart_devinfo) uart_sysdevs; @@ -201,7 +201,7 @@ .init = at91_usart_init, .term = at91_usart_term, .putc = at91_usart_putc, - .poll = at91_usart_poll, + .rxready = at91_usart_rxready, .getc = at91_usart_getc, }; @@ -252,15 +252,13 @@ } /* - * Poll for a character available + * Check for a character available. */ static int -at91_usart_poll(struct uart_bas *bas) +at91_usart_rxready(struct uart_bas *bas) { - if (!(RD4(bas, USART_CSR) & USART_CSR_RXRDY)) - return (-1); - return (RD4(bas, USART_RHR) & 0xff); + return ((RD4(bas, USART_CSR) & USART_CSR_RXRDY) != 0 ? 1 : 0); } /* ==== //depot/projects/soc2006/intr_filter/arm/sa11x0/uart_dev_sa1110.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.6 2006/06/07 11:28:17 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/uart_dev_sa1110.c,v 1.7 2007/01/18 22:01:19 marius Exp $"); #include #include @@ -52,7 +52,7 @@ static void sa1110_init(struct uart_bas *bas, int, int, int, int); static void sa1110_term(struct uart_bas *bas); static void sa1110_putc(struct uart_bas *bas, int); -static int sa1110_poll(struct uart_bas *bas); +static int sa1110_rxready(struct uart_bas *bas); static int sa1110_getc(struct uart_bas *bas, struct mtx *mtx); extern SLIST_HEAD(uart_devinfo_list, uart_devinfo) uart_sysdevs; @@ -62,7 +62,7 @@ .init = sa1110_init, .term = sa1110_term, .putc = sa1110_putc, - .poll = sa1110_poll, + .rxready = sa1110_rxready, .getc = sa1110_getc, }; @@ -102,11 +102,10 @@ } static int -sa1110_poll(struct uart_bas *bas) +sa1110_rxready(struct uart_bas *bas) { - if (!(uart_getreg(bas, SACOM_SR1) & SR1_RNE)) - return (-1); - return (uart_getreg(bas, SACOM_DR) & 0xff); + + return ((uart_getreg(bas, SACOM_SR1) & SR1_RNE) != 0 ? 1 : 0); } static int ==== //depot/projects/soc2006/intr_filter/compat/linprocfs/linprocfs.c#8 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.101 2006/11/27 21:10:55 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.105 2007/01/21 13:18:52 netchild Exp $"); #include #include @@ -121,7 +121,7 @@ * This character array is used with ki_stati-1 as an index and tries to * map our states to suitable linux states. */ -static char *linux_state = "RRSTZDD"; +static char linux_state[] = "RRSTZDD"; /* * Filler function for proc/meminfo @@ -462,15 +462,25 @@ linprocfs_doprocstat(PFS_FILL_ARGS) { struct kinfo_proc kp; + char state; + static int ratelimit = 0; PROC_LOCK(p); fill_kinfo_proc(p, &kp); sbuf_printf(sb, "%d", p->p_pid); #define PS_ADD(name, fmt, arg) sbuf_printf(sb, " " fmt, arg) PS_ADD("comm", "(%s)", p->p_comm); - KASSERT(kp.ki_stat <= sizeof(linux_state), - ("linprocfs: don't know how to handle unknown FreeBSD state")); - PS_ADD("state", "%c", linux_state[kp.ki_stat - 1]); + if (kp.ki_stat > sizeof(linux_state)) { + state = 'R'; + + if (ratelimit == 0) { + printf("linprocfs: don't know how to handle unknown FreeBSD state %d/%zd, mapping to R\n", + kp.ki_stat, sizeof(linux_state)); + ++ratelimit; + } + } else + state = linux_state[kp.ki_stat - 1]; + PS_ADD("state", "%c", state); PS_ADD("ppid", "%d", p->p_pptr ? p->p_pptr->p_pid : 0); PS_ADD("pgrp", "%d", p->p_pgid); PS_ADD("session", "%d", p->p_session->s_sid); ==== //depot/projects/soc2006/intr_filter/compat/linux/linux_emul.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.12 2007/01/07 19:09:20 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.13 2007/01/20 14:58:59 netchild Exp $"); #include "opt_compat.h" @@ -91,17 +91,12 @@ struct linux_emuldata_shared *s; s = malloc(sizeof *s, M_LINUX, M_WAITOK | M_ZERO); - em->shared = s; s->refs = 1; s->group_pid = child; LIST_INIT(&s->threads); + em->shared = s; } - p = pfind(child); - KASSERT(p != NULL, ("process not found in proc_init\n")); - p->p_emuldata = em; - PROC_UNLOCK(p); - EMUL_LOCK(&emul_lock); } else { /* lookup the old one */ em = em_find(td->td_proc, EMUL_DOLOCK); @@ -120,11 +115,12 @@ if (flags & CLONE_THREAD) { /* lookup the parent */ EMUL_SHARED_WLOCK(&emul_shared_lock); - p_em = em_find(td->td_proc, EMUL_DONTLOCK); + p_em = em_find(td->td_proc, EMUL_DOLOCK); KASSERT(p_em != NULL, ("proc_init: parent emuldata not found for CLONE_THREAD\n")); em->shared = p_em->shared; em->shared->refs++; EMUL_SHARED_WUNLOCK(&emul_shared_lock); + EMUL_UNLOCK(&emul_lock); } else { /* * handled earlier to avoid malloc(M_WAITOK) with @@ -133,12 +129,13 @@ } } 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); p = pfind(child); + KASSERT(p != NULL, ("process not found in proc_init\n")); + p->p_emuldata = em; /* we might have a sleeping linux_schedtail */ wakeup(&p->p_emuldata); PROC_UNLOCK(p); ==== //depot/projects/soc2006/intr_filter/compat/linux/linux_file.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.100 2007/01/18 09:32:08 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.101 2007/01/18 10:42:10 kib Exp $"); #include "opt_compat.h" #include "opt_mac.h" ==== //depot/projects/soc2006/intr_filter/conf/files.sparc64#5 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.86 2007/01/16 22:08:27 marius Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.87 2007/01/20 12:53:30 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -49,7 +49,9 @@ dev/fb/machfb.c optional machfb sc dev/hwpmc/hwpmc_sparc64.c optional hwpmc dev/kbd/kbd.c optional atkbd | sc | ukbd +dev/le/if_le_lebuffer.c optional le sbus dev/le/if_le_ledma.c optional le sbus +dev/le/lebuffer_sbus.c optional le sbus dev/ofw/ofw_bus_if.m standard dev/ofw/ofw_bus_subr.c standard dev/ofw/ofw_console.c optional ofw_console ==== //depot/projects/soc2006/intr_filter/conf/options#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.572 2007/01/10 18:45:17 marius Exp $ +# $FreeBSD: src/sys/conf/options,v 1.573 2007/01/18 13:33:36 marius Exp $ # # On the handling of kernel options # @@ -662,6 +662,8 @@ DEV_CARP opt_carp.h DEV_SPLASH opt_splash.h +# EISA support +DEV_EISA opt_eisa.h EISA_SLOTS opt_eisa.h # ed driver ==== //depot/projects/soc2006/intr_filter/conf/options.sun4v#2 (text+ko) ==== @@ -1,12 +1,7 @@ -# $FreeBSD: src/sys/conf/options.sun4v,v 1.1 2006/10/05 06:14:24 kmacy Exp $ +# $FreeBSD: src/sys/conf/options.sun4v,v 1.2 2007/01/19 12:22:50 marius Exp $ SUN4V opt_global.h -GFB_DEBUG opt_gfb.h -GFB_NO_FONT_LOADING opt_gfb.h -GFB_NO_MODE_CHANGE opt_gfb.h - -DEBUGGER_ON_POWERFAIL opt_psycho.h OFW_PCI_DEBUG opt_ofw_pci.h OFWCONS_POLL_HZ opt_ofw.h # Debug IOMMU inserts/removes using diagnostic accesses. Very loud. ==== //depot/projects/soc2006/intr_filter/dev/aic7xxx/aic79xx.h#2 (text+ko) ==== @@ -39,7 +39,7 @@ * * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#107 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.h,v 1.24 2005/01/06 01:42:25 imp Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.h,v 1.25 2007/01/19 22:37:52 jhb Exp $ */ #ifndef _AIC79XX_H_ @@ -1244,6 +1244,9 @@ /* PCI cacheline size. */ u_int pci_cachesize; + /* PCI-X capability offset. */ + int pcix_ptr; + /* IO Cell Parameters */ uint8_t iocell_opts[AHD_NUM_PER_DEV_ANNEXCOLS]; ==== //depot/projects/soc2006/intr_filter/dev/aic7xxx/aic79xx_pci.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #include "aic79xx_inline.h" #else #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_pci.c,v 1.24 2005/12/04 02:12:40 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_pci.c,v 1.25 2007/01/19 22:37:52 jhb Exp $"); #include #include #endif @@ -342,7 +342,12 @@ error = entry->setup(ahd); if (error != 0) return (error); - + + /* + * Find the PCI-X cap pointer. If we don't find it, + * pcix_ptr will be 0. + */ + pci_find_extcap(ahd->dev_softc, PCIY_PCIX, &ahd->pcix_ptr); devconfig = aic_pci_read_config(ahd->dev_softc, DEVCONFIG, /*bytes*/4); if ((devconfig & PCIXINITPAT) == PCIXINIT_PCI33_66) { ahd->chip |= AHD_PCI; @@ -350,6 +355,8 @@ ahd->bugs &= ~AHD_PCIX_BUG_MASK; } else { ahd->chip |= AHD_PCIX; + if (ahd->pcix_ptr == 0) + return (ENXIO); } ahd->bus_description = pci_bus_modes[PCI_BUS_MODES_INDEX(devconfig)]; @@ -867,16 +874,16 @@ uint8_t sg_split_status1[2]; ahd_mode_state saved_modes; u_int i; - uint16_t pcix_status; + uint32_t pcix_status; /* * Check for splits in all modes. Modes 0 and 1 * additionally have SG engine splits to look at. */ - pcix_status = aic_pci_read_config(ahd->dev_softc, PCIXR_STATUS, - /*bytes*/2); + pcix_status = aic_pci_read_config(ahd->dev_softc, + ahd->pcix_ptr + PCIXR_STATUS, /*bytes*/ 4); printf("%s: PCI Split Interrupt - PCI-X status = 0x%x\n", - ahd_name(ahd), pcix_status); + ahd_name(ahd), pcix_status >> 16); saved_modes = ahd_save_modes(ahd); for (i = 0; i < 4; i++) { ahd_set_modes(ahd, i, i); @@ -922,8 +929,8 @@ /* * Clear PCI-X status bits. */ - aic_pci_write_config(ahd->dev_softc, PCIXR_STATUS, - pcix_status, /*bytes*/2); + aic_pci_write_config(ahd->dev_softc, ahd->pcix_ptr + PCIXR_STATUS, + pcix_status, /*bytes*/4); ahd_outb(ahd, CLRINT, CLRSPLTINT); ahd_restore_modes(ahd, saved_modes); } ==== //depot/projects/soc2006/intr_filter/dev/bce/if_bce.c#11 (text) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.25 2007/01/13 04:35:15 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.26 2007/01/20 17:05:12 scottl Exp $"); /* * The following controllers are supported by this driver: @@ -5231,7 +5231,7 @@ { struct ifnet *ifp; struct ifmultiaddr *ifma; - u32 hashes[4] = { 0, 0, 0, 0 }; + u32 hashes[NUM_MC_HASH_REGISTERS] = { 0, 0, 0, 0, 0, 0, 0, 0 }; u32 rx_mode, sort_mode; int h, i; @@ -5279,12 +5279,12 @@ if (ifma->ifma_addr->sa_family != AF_LINK) continue; h = ether_crc32_le(LLADDR((struct sockaddr_dl *) - ifma->ifma_addr), ETHER_ADDR_LEN) & 0x7F; - hashes[(h & 0x60) >> 5] |= 1 << (h & 0x1F); + ifma->ifma_addr), ETHER_ADDR_LEN) & 0xFF; + hashes[(h & 0xE0) >> 5] |= 1 << (h & 0x1F); } IF_ADDR_UNLOCK(ifp); - for (i = 0; i < 4; i++) + for (i = 0; i < NUM_MC_HASH_REGISTERS; i++) REG_WR(sc, BCE_EMAC_MULTICAST_HASH0 + (i * 4), hashes[i]); sort_mode |= BCE_RPM_SORT_USER0_MC_HSH_EN; ==== //depot/projects/soc2006/intr_filter/dev/cardbus/cardbus.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.62 2006/06/12 03:17:24 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.63 2007/01/19 08:49:28 imp Exp $"); #include #include @@ -217,7 +217,8 @@ int tmp; int err = 0; - device_get_children(cbdev, &devlist, &numdevs); + if (device_get_children(cbdev, &devlist, &numdevs) != 0) + return (ENOENT); if (numdevs == 0) { free(devlist, M_TEMP); @@ -251,7 +252,9 @@ struct cardbus_devinfo *dinfo; DEVICE_IDENTIFY(driver, cbdev); - device_get_children(cbdev, &devlist, &numdevs); + if (device_get_children(cbdev, &devlist, &numdevs) != 0) + return; + /* * If there are no drivers attached, but there are children, * then power the card up. ==== //depot/projects/soc2006/intr_filter/dev/dpt/dpt.h#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ -#ident "$FreeBSD: src/sys/dev/dpt/dpt.h,v 1.16 2005/01/06 01:42:35 imp Exp $" +#ident "$FreeBSD: src/sys/dev/dpt/dpt.h,v 1.17 2007/01/18 13:33:36 marius Exp $" #ifndef _DPT_H #define _DPT_H @@ -1292,7 +1292,9 @@ int dpt_attach(dpt_softc_t * dpt); void dpt_intr(void *arg); +#ifdef DEV_EISA dpt_conf_t * dpt_pio_get_conf(u_int32_t); +#endif #if 0 extern void hex_dump(u_char * data, int length, ==== //depot/projects/soc2006/intr_filter/dev/dpt/dpt_eisa.c#4 (text+ko) ==== @@ -26,7 +26,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/dpt/dpt_eisa.c,v 1.21 2006/12/11 18:28:30 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/dpt/dpt_eisa.c,v 1.22 2007/01/18 13:33:36 marius Exp $"); + +#include "opt_eisa.h" #include #include ==== //depot/projects/soc2006/intr_filter/dev/dpt/dpt_scsi.c#4 (text+ko) ==== @@ -27,9 +27,9 @@ * SUCH DAMAGE. */ -#ident "$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.54 2006/11/02 00:54:36 mjacob Exp $" +#ident "$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.55 2007/01/18 13:33:36 marius Exp $" #include -__FBSDID("$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.54 2006/11/02 00:54:36 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.55 2007/01/18 13:33:36 marius Exp $"); /* * dpt_scsi.c: SCSI dependant code for the DPT driver @@ -50,6 +50,8 @@ #define _DPT_C_ #include "opt_dpt.h" +#include "opt_eisa.h" + #include #include #include @@ -106,7 +108,9 @@ /* ================= Private Inline Function declarations ===================*/ static __inline int dpt_just_reset(dpt_softc_t * dpt); static __inline int dpt_raid_busy(dpt_softc_t * dpt); +#ifdef DEV_EISA static __inline int dpt_pio_wait (u_int32_t, u_int, u_int, u_int); +#endif static __inline int dpt_wait(dpt_softc_t *dpt, u_int bits, u_int state); static __inline struct dpt_ccb* dptgetccb(struct dpt_softc *dpt); @@ -181,6 +185,7 @@ return (0); } +#ifdef DEV_EISA static __inline int dpt_pio_wait (u_int32_t base, u_int reg, u_int bits, u_int state) { @@ -196,6 +201,7 @@ } return (-1); } +#endif static __inline int dpt_wait(dpt_softc_t *dpt, u_int bits, u_int state) @@ -386,6 +392,7 @@ return (i); } +#ifdef DEV_EISA dpt_conf_t * dpt_pio_get_conf (u_int32_t base) { @@ -478,6 +485,7 @@ } return (NULL); } +#endif /* * Read a configuration page into the supplied dpt_cont_t buffer. ==== //depot/projects/soc2006/intr_filter/dev/fb/fbreg.h#2 (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/fb/fbreg.h,v 1.20 2005/12/06 11:19:36 ru Exp $ + * $FreeBSD: src/sys/dev/fb/fbreg.h,v 1.21 2007/01/18 13:08:08 marius Exp $ */ #ifndef _DEV_FB_FBREG_H_ @@ -50,7 +50,8 @@ #define bzero_io(d, c) bzero((void *)(d), (c)) #define fill_io(p, d, c) fill((p), (void *)(d), (c)) #define fillw_io(p, d, c) fillw((p), (void *)(d), (c)) -#elif defined(__ia64__) +#elif defined(__ia64__) || defined(__sparc64__) +#if defined(__ia64__) #include #define bcopy_fromio(s, d, c) \ bus_space_read_region_1(IA64_BUS_SPACE_MEM, s, 0, (void*)(d), c) @@ -69,6 +70,7 @@ #define writeb(a, v) bus_space_write_1(IA64_BUS_SPACE_MEM, a, 0, v) #define writew(a, v) bus_space_write_2(IA64_BUS_SPACE_MEM, a, 0, v) #define writel(a, v) bus_space_write_4(IA64_BUS_SPACE_MEM, a, 0, v) +#endif /* __ia64__ */ static __inline void fillw(int val, uint16_t *buf, size_t size) { @@ -91,7 +93,7 @@ u_int16_t ofwfb_readw(u_int16_t *addr); void ofwfb_writew(u_int16_t *addr, u_int16_t val); -#else /* !__i386__ && !__ia64__ && !__amd64__ && !__powerpc__ */ +#else /* !__i386__ && !__amd64__ && !__ia64__ && !__sparc64__ && !__powerpc__ */ #define bcopy_io(s, d, c) memcpy_io((d), (s), (c)) #define bcopy_toio(s, d, c) memcpy_toio((d), (void *)(s), (c)) #define bcopy_fromio(s, d, c) memcpy_fromio((void *)(d), (s), (c)) ==== //depot/projects/soc2006/intr_filter/dev/isp/isp.c#12 (text+ko) ==== @@ -43,7 +43,7 @@ #endif #ifdef __FreeBSD__ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.136 2007/01/05 22:59:26 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.137 2007/01/20 04:00:20 mjacob Exp $"); #include #endif #ifdef __OpenBSD__ @@ -1170,6 +1170,14 @@ isp->isp_maxluns = 16; } } + /* + * Must do this first to get defaults established. + */ + isp_setdfltparm(isp, 0); + if (IS_DUALBUS(isp)) { + isp_setdfltparm(isp, 1); + } + } /* @@ -1181,14 +1189,6 @@ void isp_init(ispsoftc_t *isp) { - /* - * Must do this first to get defaults established. - */ - isp_setdfltparm(isp, 0); - if (IS_DUALBUS(isp)) { - isp_setdfltparm(isp, 1); - } - if (IS_FC(isp)) { /* * Do this *before* initializing the firmware. @@ -3956,6 +3956,7 @@ static uint16_t isp_nxt_handle(ispsoftc_t *isp, uint16_t handle) { + int i; if (handle == NIL_HANDLE) { if (FCPARAM(isp)->isp_topo == TOPO_F_PORT) { handle = 0; @@ -3982,9 +3983,16 @@ } if (handle == FCPARAM(isp)->isp_loopid) { return (isp_nxt_handle(isp, handle)); - } else { - return (handle); + } + for (i = 0; i < MAX_FC_TARG; i++) { + if (FCPARAM(isp)->portdb[i].state == FC_PORTDB_STATE_NIL) { + continue; + } + if (FCPARAM(isp)->portdb[i].handle == handle) { + return (isp_nxt_handle(isp, handle)); + } } + return (handle); } /* @@ -7034,15 +7042,16 @@ fcp->isp_retry_count = ICB_DFLT_RCOUNT; /* Platform specific.... */ fcp->isp_loopid = DEFAULT_LOOPID(isp); - fcp->isp_nodewwn = DEFAULT_NODEWWN(isp); - fcp->isp_portwwn = DEFAULT_PORTWWN(isp); + fcp->isp_wwnn_nvram = DEFAULT_NODEWWN(isp); + fcp->isp_wwpn_nvram = DEFAULT_PORTWWN(isp); fcp->isp_fwoptions = 0; fcp->isp_fwoptions |= ICBOPT_FAIRNESS; fcp->isp_fwoptions |= ICBOPT_PDBCHANGE_AE; fcp->isp_fwoptions |= ICBOPT_HARD_ADDRESS; fcp->isp_fwoptions |= ICBOPT_FAST_POST; - if (isp->isp_confopts & ISP_CFG_FULL_DUPLEX) + if (isp->isp_confopts & ISP_CFG_FULL_DUPLEX) { fcp->isp_fwoptions |= ICBOPT_FULL_DUPLEX; + } /* * Make sure this is turned off now until we get @@ -7052,7 +7061,7 @@ /* * Now try and read NVRAM unless told to not do so. - * This will set fcparam's isp_nodewwn && isp_portwwn. + * This will set fcparam's isp_wwnn_nvram && isp_wwpn_nvram. */ if ((isp->isp_confopts & ISP_CFG_NONVRAM) == 0) { nvfail = isp_read_nvram(isp); @@ -7081,8 +7090,8 @@ * We always start out with values derived * from NVRAM or our platform default. */ - ISP_NODEWWN(isp) = fcp->isp_nodewwn; - if (fcp->isp_nodewwn == 0) { + ISP_NODEWWN(isp) = fcp->isp_wwnn_nvram; + if (fcp->isp_wwnn_nvram == 0) { isp_prt(isp, ISP_LOGCONFIG, "bad WWNN- using default"); ISP_NODEWWN(isp) = DEFAULT_NODEWWN(isp); @@ -7098,8 +7107,8 @@ * We always start out with values derived * from NVRAM or our platform default. */ - ISP_PORTWWN(isp) = fcp->isp_portwwn; - if (fcp->isp_portwwn == 0) { + ISP_PORTWWN(isp) = fcp->isp_wwpn_nvram; + if (fcp->isp_wwpn_nvram == 0) { isp_prt(isp, ISP_LOGCONFIG, "bad WWPN- using default"); ISP_PORTWWN(isp) = DEFAULT_PORTWWN(isp); @@ -7841,10 +7850,10 @@ /* * Make sure we have both Node and Port as non-zero values. */ - if (fcp->isp_nodewwn != 0 && fcp->isp_portwwn == 0) { - fcp->isp_portwwn = fcp->isp_nodewwn; - } else if (fcp->isp_nodewwn == 0 && fcp->isp_portwwn != 0) { - fcp->isp_nodewwn = fcp->isp_portwwn; + if (fcp->isp_wwnn_nvram != 0 && fcp->isp_wwpn_nvram == 0) { + fcp->isp_wwpn_nvram = fcp->isp_wwnn_nvram; + } else if (fcp->isp_wwnn_nvram == 0 && fcp->isp_wwpn_nvram != 0) { + fcp->isp_wwnn_nvram = fcp->isp_wwpn_nvram; } /* @@ -7853,14 +7862,14 @@ * make sure that there's some non-zero value in 48..56 * for the Port WWN. */ - if (fcp->isp_nodewwn && fcp->isp_portwwn) { - if ((fcp->isp_nodewwn & (((uint64_t) 0xfff) << 48)) != 0 && - (fcp->isp_nodewwn >> 60) == 2) { - fcp->isp_nodewwn &= ~((uint64_t) 0xfff << 48); + if (fcp->isp_wwnn_nvram && fcp->isp_wwpn_nvram) { + if ((fcp->isp_wwnn_nvram & (((uint64_t) 0xfff) << 48)) != 0 && + (fcp->isp_wwnn_nvram >> 60) == 2) { + fcp->isp_wwnn_nvram &= ~((uint64_t) 0xfff << 48); } - if ((fcp->isp_portwwn & (((uint64_t) 0xfff) << 48)) == 0 && - (fcp->isp_portwwn >> 60) == 2) { - fcp->isp_portwwn |= ((uint64_t) 1 << 56); + if ((fcp->isp_wwpn_nvram & (((uint64_t) 0xfff) << 48)) == 0 && + (fcp->isp_wwpn_nvram >> 60) == 2) { + fcp->isp_wwpn_nvram |= ((uint64_t) 1 << 56); } } } @@ -7890,7 +7899,7 @@ wwn |= (((uint64_t) 2)<< 60); } } - fcp->isp_portwwn = wwn; + fcp->isp_wwpn_nvram = wwn; if (IS_2200(isp) || IS_23XX(isp)) { wwn = ISP2100_NVRAM_NODE_NAME(nvram_data); if (wwn) { @@ -7904,7 +7913,7 @@ } else { wwn &= ~((uint64_t) 0xfff << 48); } - fcp->isp_nodewwn = wwn; + fcp->isp_wwnn_nvram = wwn; isp_fix_nvram_wwns(isp); @@ -7924,8 +7933,8 @@ fcp->isp_fwoptions = ISP2100_NVRAM_OPTIONS(nvram_data); isp_prt(isp, ISP_LOGDEBUG0, "NVRAM 0x%08x%08x 0x%08x%08x maxalloc %d maxframelen %d", - (uint32_t) (fcp->isp_nodewwn >> 32), (uint32_t) fcp->isp_nodewwn, - (uint32_t) (fcp->isp_portwwn >> 32), (uint32_t) fcp->isp_portwwn, + (uint32_t) (fcp->isp_wwnn_nvram >> 32), (uint32_t) fcp->isp_wwnn_nvram, + (uint32_t) (fcp->isp_wwpn_nvram >> 32), (uint32_t) fcp->isp_wwpn_nvram, ISP2100_NVRAM_MAXIOCBALLOCATION(nvram_data), ISP2100_NVRAM_MAXFRAMELENGTH(nvram_data)); isp_prt(isp, ISP_LOGDEBUG0, @@ -7969,7 +7978,7 @@ wwn = 0; } } - fcp->isp_portwwn = wwn; + fcp->isp_wwpn_nvram = wwn; wwn = ISP2400_NVRAM_NODE_NAME(nvram_data); if (wwn) { @@ -7977,7 +7986,7 @@ wwn = 0; } } - fcp->isp_nodewwn = wwn; + fcp->isp_wwnn_nvram = wwn; isp_fix_nvram_wwns(isp); ==== //depot/projects/soc2006/intr_filter/dev/isp/isp_freebsd.c#9 (text+ko) ==== @@ -29,7 +29,7 @@ * Platform (FreeBSD) dependent common attachment code for Qlogic adapters. */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.132 2006/12/18 23:50:30 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.133 2007/01/20 04:00:20 mjacob Exp $"); #include #include #include @@ -42,6 +42,7 @@ #include #endif #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jan 21 16:18:24 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A79016A406; Sun, 21 Jan 2007 16:18:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B49F716A400 for ; Sun, 21 Jan 2007 16:18:23 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A5FDF13C459 for ; Sun, 21 Jan 2007 16:18:23 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0LGINEh064206 for ; Sun, 21 Jan 2007 16:18:23 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LGINAt064197 for perforce@freebsd.org; Sun, 21 Jan 2007 16:18:23 GMT (envelope-from piso@freebsd.org) Date: Sun, 21 Jan 2007 16:18:23 GMT Message-Id: <200701211618.l0LGINAt064197@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 113256 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 16:18:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=113256 Change 113256 by piso@piso_newluxor on 2007/01/21 16:17:42 Fixed mismerge. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/le/if_le_lebuffer.c#2 edit .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/upa.c#3 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/le/if_le_lebuffer.c#2 (text+ko) ==== @@ -341,7 +341,7 @@ } error = bus_setup_intr(dev, lesc->sc_ires, INTR_TYPE_NET | INTR_MPSAFE, - am7990_intr, sc, &lesc->sc_ih); + NULL, am7990_intr, sc, &lesc->sc_ih); if (error != 0) { device_printf(dev, "cannot set up interrupt\n"); goto fail_am7990; ==== //depot/projects/soc2006/intr_filter/sparc64/sparc64/upa.c#3 (text+ko) ==== @@ -401,7 +401,7 @@ static int upa_setup_intr(device_t dev, device_t child, struct resource *ires, int flags, - driver_intr_t *func, void *arg, void **cookiep) + driver_filter_t *filt, driver_intr_t *func, void *arg, void **cookiep) { struct upa_softc *sc; uint64_t intrmap; @@ -427,8 +427,8 @@ UPA_WRITE(sc, imr, 0x0, intrmap & ~INTMAP_V); (void)UPA_READ(sc, imr, 0x0); - error = bus_generic_setup_intr(dev, child, ires, flags, func, arg, - cookiep); + error = bus_generic_setup_intr(dev, child, ires, flags, filt, func, + arg, cookiep); if (error != 0) return (error); UPA_WRITE(sc, imr, 0x0, INTMAP_ENABLE(intrmap, PCPU_GET(mid))); From owner-p4-projects@FreeBSD.ORG Sun Jan 21 19:48:52 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EBFF716A405; Sun, 21 Jan 2007 19:48:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A69F916A403 for ; Sun, 21 Jan 2007 19:48:51 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7E7B613C43E for ; Sun, 21 Jan 2007 19:48:51 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0LJmppO019009 for ; Sun, 21 Jan 2007 19:48:51 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LJmpKo019006 for perforce@freebsd.org; Sun, 21 Jan 2007 19:48:51 GMT (envelope-from sam@freebsd.org) Date: Sun, 21 Jan 2007 19:48:51 GMT Message-Id: <200701211948.l0LJmpKo019006@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 113262 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 19:48:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=113262 Change 113262 by sam@sam_ebb on 2007/01/21 19:48:24 add IEEE80211_IS_CHAN_PASSIVE Affected files ... .. //depot/projects/wifi/sys/net80211/_ieee80211.h#14 edit Differences ... ==== //depot/projects/wifi/sys/net80211/_ieee80211.h#14 (text+ko) ==== @@ -204,6 +204,8 @@ (((_c)->ic_flags & (IEEE80211_CHAN_QUARTER | IEEE80211_CHAN_HALF)) == 0) #define IEEE80211_IS_CHAN_GSM(_c) \ (((_c)->ic_flags & IEEE80211_CHAN_GSM) != 0) +#define IEEE80211_IS_CHAN_PASSIVE(_c) \ + (((_c)->ic_flags & IEEE80211_CHAN_PASSIVE) != 0) /* ni_chan encoding for FH phy */ #define IEEE80211_FH_CHANMOD 80 From owner-p4-projects@FreeBSD.ORG Sun Jan 21 19:51:56 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C248D16A403; Sun, 21 Jan 2007 19:51:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8209F16A400 for ; Sun, 21 Jan 2007 19:51:56 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 71E3A13C461 for ; Sun, 21 Jan 2007 19:51:56 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0LJpuiU019755 for ; Sun, 21 Jan 2007 19:51:56 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LJpunf019736 for perforce@freebsd.org; Sun, 21 Jan 2007 19:51:56 GMT (envelope-from sam@freebsd.org) Date: Sun, 21 Jan 2007 19:51:56 GMT Message-Id: <200701211951.l0LJpunf019736@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 113263 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 19:51:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=113263 Change 113263 by sam@sam_ebb on 2007/01/21 19:51:42 Cleanup channel manipulation ioctls a bit: o change IEEE80211_IOC_CHANINFO to return the complete channel list the kernel uses, don't suppress/combine duplicates o add IEEE80211_IOC_CURCHAN ioctl to replace IEEE80211_IOC_CHANNEL for getting and setting the current channel; this allows us to unambiguously specify a channel when a single frequency can be operated in multiple ways (e.g. different channel width) Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#64 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#36 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#64 (text+ko) ==== @@ -158,29 +158,14 @@ static int ieee80211_ioctl_getchaninfo(struct ieee80211com *ic, struct ieee80211req *ireq) { - struct ieee80211req_chaninfo chans; /* XXX off stack? */ - u_int8_t reported[IEEE80211_CHAN_BYTES]; /* XXX stack usage */ - int i, space; - - memset(&chans, 0, sizeof(chans)); - memset(&reported, 0, sizeof(reported)); - for (i = 0; i < ic->ic_nchans; i++) { - const struct ieee80211_channel *c = &ic->ic_channels[i]; + int space; - /* discard if previously reported (e.g. b/g) */ - if (isclr(reported, c->ic_ieee)) { - setbit(reported, c->ic_ieee); - chans.ic_chans[chans.ic_nchans].ic_freq = c->ic_freq; - chans.ic_chans[chans.ic_nchans].ic_flags = c->ic_flags; - if (++chans.ic_nchans >= IEEE80211_CHAN_MAX) - break; - } - } space = __offsetof(struct ieee80211req_chaninfo, - ic_chans[chans.ic_nchans]); + ic_chans[ic->ic_nchans]); if (space > ireq->i_len) space = ireq->i_len; - return copyout(&chans, ireq->i_data, space); + /* XXX assumes compatible layout */ + return copyout(&ic->ic_nchans, ireq->i_data, space); } static int @@ -804,6 +789,14 @@ return (ic->ic_flags & cap) != 0; } +static int +ieee80211_ioctl_getcurchan(struct ieee80211com *ic, struct ieee80211req *ireq) +{ + if (ireq->i_len != sizeof(struct ieee80211_channel)) + return EINVAL; + return copyout(ic->ic_curchan, ireq->i_data, sizeof(*ic->ic_curchan)); +} + /* * When building the kernel with -O2 on the i386 architecture, gcc * seems to want to inline this function into ieee80211_ioctl() @@ -1098,6 +1091,9 @@ case IEEE80211_IOC_BMISSTHRESHOLD: ireq->i_val = ic->ic_bmissthreshold; break; + case IEEE80211_IOC_CURCHAN: + error = ieee80211_ioctl_getcurchan(ic, ireq); + break; default: error = EINVAL; break; @@ -1767,6 +1763,65 @@ } static int +ieee80211_ioctl_setcurchan(struct ieee80211com *ic, + const struct ieee80211req *ireq) +{ + struct ieee80211_channel chan; + int error; + + if (ireq->i_len != sizeof(chan)) + return EINVAL; + error = copyin(ireq->i_data, &chan, sizeof(chan)); + if (error != 0) + return error; + /* XXX 0xffff overflows 16-bit signed */ + if (chan.ic_freq == 0 || chan.ic_freq == IEEE80211_CHAN_ANY) { + ic->ic_des_chan = IEEE80211_CHAN_ANYC; + } else { + struct ieee80211_channel *c; + + c = ieee80211_find_channel(ic, chan.ic_freq, chan.ic_flags); + if (c == NULL) + return EINVAL; + /* XXX? */ + if (ic->ic_opmode == IEEE80211_M_HOSTAP && + !check_mode_consistency(c, ic->ic_des_mode)) + return EINVAL; + if (ic->ic_state == IEEE80211_S_RUN && c == ic->ic_bsschan) + return 0; /* NB: nothing to do */ + ic->ic_des_chan = c; + } + error = 0; + if ((ic->ic_opmode == IEEE80211_M_MONITOR || + ic->ic_opmode == IEEE80211_M_WDS) && + ic->ic_des_chan != IEEE80211_CHAN_ANYC) { + /* + * Monitor and wds modes can switch directly. + */ + ic->ic_curchan = ic->ic_des_chan; + if (ic->ic_state == IEEE80211_S_RUN) + ic->ic_set_channel(ic); + } else { + /* + * Need to go through the state machine in case we + * need to reassociate or the like. The state machine + * will pickup the desired channel and avoid scanning. + */ + if (IS_UP_AUTO(ic)) + error = ieee80211_init(ic, RESCAN); + else if (ic->ic_des_chan != IEEE80211_CHAN_ANYC) { + /* + * When not up+running and a real channel has + * been specified fix the current channel so + * there is immediate feedback; e.g. via ifconfig. + */ + ic->ic_curchan = ic->ic_des_chan; + } + } + return error; +} + +static int ieee80211_ioctl_set80211(struct ieee80211com *ic, u_long cmd, struct ieee80211req *ireq) { static const u_int8_t zerobssid[IEEE80211_ADDR_LEN]; @@ -2265,6 +2320,9 @@ ic->ic_bmissthreshold = ireq->i_val; error = IS_UP(ic) ? ic->ic_reset(ic->ic_ifp) : 0; break; + case IEEE80211_IOC_CURCHAN: + error = ieee80211_ioctl_setcurchan(ic, ireq); + break; default: error = EINVAL; break; ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#36 (text+ko) ==== @@ -471,6 +471,7 @@ #define IEEE80211_IOC_BMISSTHRESHOLD 77 /* beacon miss threshold */ #define IEEE80211_IOC_STA_INFO 78 /* station/neighbor info */ #define IEEE80211_IOC_WPAIE2 79 /* WPA+RSN info elements */ +#define IEEE80211_IOC_CURCHAN 80 /* current channel */ /* * Scan result data returned for IEEE80211_IOC_SCAN_RESULTS. From owner-p4-projects@FreeBSD.ORG Sun Jan 21 19:55:01 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 649E716A404; Sun, 21 Jan 2007 19:55:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id ECD4616A400 for ; Sun, 21 Jan 2007 19:55:00 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CED4213C44B for ; Sun, 21 Jan 2007 19:55:00 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0LJt0pS020287 for ; Sun, 21 Jan 2007 19:55:00 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LJt0Cg020272 for perforce@freebsd.org; Sun, 21 Jan 2007 19:55:00 GMT (envelope-from sam@freebsd.org) Date: Sun, 21 Jan 2007 19:55:00 GMT Message-Id: <200701211955.l0LJt0Cg020272@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 113264 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 19:55:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=113264 Change 113264 by sam@sam_ebb on 2007/01/21 19:54:46 Overhaul channel handling: o purge freq<->ieee mapping; get the complete channel list from the kernel and use it to do the mapping o use new IEEE80211_IOC_CURCHAN ioctl to get+set the current channel; still needs more work to enable specifying a channel with additional attributes such as channel width o fixup channel status display; now -v shows the correct frequency and also channel information (may want to enable this by default) Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#58 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#58 (text+ko) ==== @@ -94,12 +94,78 @@ #include "ifconfig.h" -static void set80211(int s, int type, int val, int len, u_int8_t *data); +static void set80211(int s, int type, int val, int len, void *data); static const char *get_string(const char *val, const char *sep, u_int8_t *buf, int *lenp); static void print_string(const u_int8_t *buf, int len); +static struct ieee80211req_chaninfo chaninfo; + +static void +getchaninfo(int s) +{ + struct ieee80211req ireq; + + if (chaninfo.ic_nchans != 0) + return; + (void) memset(&ireq, 0, sizeof(ireq)); + (void) strncpy(ireq.i_name, name, sizeof(ireq.i_name)); + ireq.i_type = IEEE80211_IOC_CHANINFO; + ireq.i_data = &chaninfo; + ireq.i_len = sizeof(chaninfo); + if (ioctl(s, SIOCG80211, &ireq) < 0) + errx(1, "unable to get channel information"); +} + +static void +mapfreq(struct ieee80211_channel *c, int freq, int flags) +{ + int i; + + for (i = 0; i < chaninfo.ic_nchans; i++) + if (chaninfo.ic_chans[i].ic_freq == freq) { + /* when ambiguous take 11g over 11b */ + if (flags == 0 && + IEEE80211_IS_CHAN_B(&chaninfo.ic_chans[i]) && + i+1 < chaninfo.ic_nchans && + chaninfo.ic_chans[i+1].ic_freq == freq) { + i++; + } + *c = chaninfo.ic_chans[i]; + return; + } + errx(1, "unknown/undefined frequency %u/0x%x", freq, flags); +} + +static void +mapchan(struct ieee80211_channel *c, int ieee, int flags) +{ + int i; + + for (i = 0; i < chaninfo.ic_nchans; i++) + if (chaninfo.ic_chans[i].ic_ieee == ieee) { + /* when ambiguous take 11g over 11b */ + if (flags == 0 && + IEEE80211_IS_CHAN_B(&chaninfo.ic_chans[i]) && + i+1 < chaninfo.ic_nchans && + chaninfo.ic_chans[i+1].ic_ieee == ieee) { + i++; + } + *c = chaninfo.ic_chans[i]; + return; + } + errx(1, "unknown/undefined channel number %d", ieee); +} + static int +ieee80211_mhz2ieee(int freq, int flags) +{ + struct ieee80211_channel chan; + mapfreq(&chan, freq, flags); + return chan.ic_ieee; +} + +static int isanyarg(const char *arg) { return (strcmp(arg, "-") == 0 || @@ -141,74 +207,26 @@ set80211(s, IEEE80211_IOC_STATIONNAME, 0, len, data); } -/* - * Convert IEEE channel number to MHz frequency. - */ -static u_int -ieee80211_ieee2mhz(u_int chan) -{ - if (chan == 14) - return 2484; - if (chan < 14) /* 0-13 */ - return 2407 + chan*5; - if (chan < 27) /* 15-26 */ - return 2512 + ((chan-15)*20); - return 5000 + (chan*5); -} - -static __inline int -mapgsm(u_int freq, u_int flags) -{ - freq *= 10; - if (flags & IEEE80211_CHAN_QUARTER) - freq += 5; - else if (flags & IEEE80211_CHAN_HALF) - freq += 10; - else - freq += 20; - /* NB: there is no 907/20 wide but leave room */ - return (freq - 906*10) / 5; -} - -static __inline int -mappsb(u_int freq, u_int flags) -{ - return 37 + ((freq * 10) + ((freq % 5) == 2 ? 5 : 0) - 49400) / 5; -} - -/* - * Convert MHz frequency to IEEE channel number. - */ -static u_int -ieee80211_mhz2ieee(u_int freq, u_int flags) -{ - if ((flags & IEEE80211_CHAN_GSM) || (907 <= freq && freq <= 922)) - return mapgsm(freq, flags); - if (freq == 2484) - return 14; - if (freq < 2484) - return (freq - 2407) / 5; - if (freq < 5000) { - if (flags & (IEEE80211_CHAN_HALF|IEEE80211_CHAN_QUARTER)) - return mappsb(freq, flags); - else if (freq > 4900) - return (freq - 4000) / 5; - else - return 15 + ((freq - 2512) / 20); - } - return (freq - 5000) / 5; -} - static void set80211channel(const char *val, int d, int s, const struct afswtch *rafp) { + struct ieee80211_channel chan; + + memset(&chan, 0, sizeof(chan)); if (!isanyarg(val)) { + /* XXX freq/width */ int v = atoi(val); - if (v > 255) /* treat as frequency */ - v = ieee80211_mhz2ieee(v, 0); - set80211(s, IEEE80211_IOC_CHANNEL, v, 0, NULL); - } else - set80211(s, IEEE80211_IOC_CHANNEL, IEEE80211_CHAN_ANY, 0, NULL); + + getchaninfo(s); + if (v > 255) { /* treat as frequency */ + mapfreq(&chan, v, 0); + } else { + mapchan(&chan, v, 0); + } + } else { + chan.ic_freq = IEEE80211_CHAN_ANY; + } + set80211(s, IEEE80211_IOC_CURCHAN, 0, sizeof(chan), &chan); } static void @@ -503,8 +521,7 @@ break; cp = tp; } - set80211(s, IEEE80211_IOC_CHANLIST, 0, - sizeof(chanlist), (uint8_t *) &chanlist); + set80211(s, IEEE80211_IOC_CHANLIST, 0, sizeof(chanlist), &chanlist); #undef MAXCHAN } @@ -688,7 +705,7 @@ mlme.im_op = IEEE80211_MLME_DEAUTH; mlme.im_reason = IEEE80211_REASON_AUTH_EXPIRE; memcpy(mlme.im_macaddr, LLADDR(&sdl), IEEE80211_ADDR_LEN); - set80211(s, IEEE80211_IOC_MLME, 0, sizeof(mlme), (u_int8_t *) &mlme); + set80211(s, IEEE80211_IOC_MLME, 0, sizeof(mlme), &mlme); } static @@ -1242,6 +1259,8 @@ if (len < sizeof(struct ieee80211req_scan_result)) return; + getchaninfo(s); + ssidmax = verbose ? IEEE80211_NWID_LEN : 14; printf("%-*.*s %-17.17s %4s %4s %-7s %3s %4s\n" , ssidmax, ssidmax, "SSID" @@ -1356,6 +1375,8 @@ if (len < sizeof(struct ieee80211req_sta_info)) return; + getchaninfo(s); + printf("%-17.17s %4s %4s %4s %4s %4s %6s %6s %4s %4s\n" , "ADDR" , "AID" @@ -1395,77 +1416,103 @@ } while (len >= sizeof(struct ieee80211req_sta_info)); } -static void -print_chaninfo(const struct ieee80211_channel *c) +static const char * +get_chaninfo(const struct ieee80211_channel *c, char buf[], size_t bsize) { -#define IEEE80211_IS_CHAN_PASSIVE(_c) \ - (((_c)->ic_flags & IEEE80211_CHAN_PASSIVE)) - char buf[14]; - buf[0] = '\0'; if (IEEE80211_IS_CHAN_FHSS(c)) - strlcat(buf, " FHSS", sizeof(buf)); + strlcat(buf, " FHSS", bsize); if (IEEE80211_IS_CHAN_A(c)) { if (IEEE80211_IS_CHAN_HALF(c)) - strlcat(buf, " 11a/10Mhz", sizeof(buf)); + strlcat(buf, " 11a/10Mhz", bsize); else if (IEEE80211_IS_CHAN_QUARTER(c)) - strlcat(buf, " 11a/5Mhz", sizeof(buf)); + strlcat(buf, " 11a/5Mhz", bsize); else - strlcat(buf, " 11a", sizeof(buf)); + strlcat(buf, " 11a", bsize); } if (IEEE80211_IS_CHAN_ANYG(c)) { if (IEEE80211_IS_CHAN_HALF(c)) - strlcat(buf, " 11g/10Mhz", sizeof(buf)); + strlcat(buf, " 11g/10Mhz", bsize); else if (IEEE80211_IS_CHAN_QUARTER(c)) - strlcat(buf, " 11g/5Mhz", sizeof(buf)); + strlcat(buf, " 11g/5Mhz", bsize); else - strlcat(buf, " 11g", sizeof(buf)); + strlcat(buf, " 11g", bsize); } else if (IEEE80211_IS_CHAN_B(c)) - strlcat(buf, " 11b", sizeof(buf)); + strlcat(buf, " 11b", bsize); if (IEEE80211_IS_CHAN_TURBO(c)) - strlcat(buf, " Turbo", sizeof(buf)); + strlcat(buf, " Turbo", bsize); + return buf; +} + +static void +print_chaninfo(const struct ieee80211_channel *c) +{ + char buf[14]; + printf("Channel %3u : %u%c Mhz%-14.14s", ieee80211_mhz2ieee(c->ic_freq, c->ic_flags), c->ic_freq, - IEEE80211_IS_CHAN_PASSIVE(c) ? '*' : ' ', buf); -#undef IEEE80211_IS_CHAN_PASSIVE + IEEE80211_IS_CHAN_PASSIVE(c) ? '*' : ' ', + get_chaninfo(c, buf, sizeof(buf))); } static void list_channels(int s, int allchans) { - struct ieee80211req ireq; - struct ieee80211req_chaninfo chans; struct ieee80211req_chaninfo achans; + uint8_t reported[IEEE80211_CHAN_BYTES]; const struct ieee80211_channel *c; - int i, half, ieee; + int i, half; - (void) memset(&ireq, 0, sizeof(ireq)); - (void) strncpy(ireq.i_name, name, sizeof(ireq.i_name)); - ireq.i_type = IEEE80211_IOC_CHANINFO; - ireq.i_data = &chans; - ireq.i_len = sizeof(chans); - if (ioctl(s, SIOCG80211, &ireq) < 0) - errx(1, "unable to get channel information"); + getchaninfo(s); + memset(&achans, 0, sizeof(achans)); + memset(reported, 0, sizeof(reported)); if (!allchans) { struct ieee80211req_chanlist active; + struct ieee80211req ireq; + (void) memset(&ireq, 0, sizeof(ireq)); + (void) strncpy(ireq.i_name, name, sizeof(ireq.i_name)); ireq.i_type = IEEE80211_IOC_CHANLIST; ireq.i_data = &active; ireq.i_len = sizeof(active); if (ioctl(s, SIOCG80211, &ireq) < 0) errx(1, "unable to get active channel list"); memset(&achans, 0, sizeof(achans)); - for (i = 0; i < chans.ic_nchans; i++) { - c = &chans.ic_chans[i]; - ieee = ieee80211_mhz2ieee(c->ic_freq, c->ic_flags); - if (isset(active.ic_channels, ieee) || allchans) + for (i = 0; i < chaninfo.ic_nchans; i++) { + c = &chaninfo.ic_chans[i]; + if (!isset(active.ic_channels, c->ic_ieee)) + continue; + /* + * Suppress compatible duplicates unless + * verbose. The kernel gives us it's + * complete channel list which has separate + * entries for 11g/11b and 11a/turbo. + */ + if (isset(reported, c->ic_ieee) && !verbose) { + /* XXX we assume duplicates are adjacent */ + achans.ic_chans[achans.ic_nchans-1] = *c; + } else { + achans.ic_chans[achans.ic_nchans++] = *c; + setbit(reported, c->ic_ieee); + } + } + } else { + for (i = 0; i < chaninfo.ic_nchans; i++) { + c = &chaninfo.ic_chans[i]; + /* suppress duplicates as above */ + if (isset(reported, c->ic_ieee) && !verbose) { + /* XXX we assume duplicates are adjacent */ + achans.ic_chans[achans.ic_nchans-1] = *c; + } else { achans.ic_chans[achans.ic_nchans++] = *c; + setbit(reported, c->ic_ieee); + } } - } else - achans = chans; + } half = achans.ic_nchans / 2; if (achans.ic_nchans % 2) half++; + for (i = 0; i < achans.ic_nchans / 2; i++) { print_chaninfo(&achans.ic_chans[i]); print_chaninfo(&achans.ic_chans[half+i]); @@ -1663,31 +1710,6 @@ return IEEE80211_M_STA; } -static const struct ieee80211_channel * -getchaninfo(int s, int chan) -{ - struct ieee80211req ireq; - static struct ieee80211req_chaninfo chans; - static struct ieee80211_channel undef; - const struct ieee80211_channel *c; - int i, freq; - - (void) memset(&ireq, 0, sizeof(ireq)); - (void) strncpy(ireq.i_name, name, sizeof(ireq.i_name)); - ireq.i_type = IEEE80211_IOC_CHANINFO; - ireq.i_data = &chans; - ireq.i_len = sizeof(chans); - if (ioctl(s, SIOCG80211, &ireq) < 0) - errx(1, "unable to get channel information"); - freq = ieee80211_ieee2mhz(chan); - for (i = 0; i < chans.ic_nchans; i++) { - c = &chans.ic_chans[i]; - if (c->ic_freq == freq) - return c; - } - return &undef; -} - #if 0 static void printcipher(int s, struct ieee80211req *ireq, int keylenop) @@ -1833,6 +1855,7 @@ int i, num, wpa, wme, bgscan, bgscaninterval; struct ieee80211req ireq; u_int8_t data[32]; + struct ieee80211_channel chan; const struct ieee80211_channel *c; (void) memset(&ireq, 0, sizeof(ireq)); @@ -1864,14 +1887,27 @@ } else print_string(data, ireq.i_len); - ireq.i_type = IEEE80211_IOC_CHANNEL; - if (ioctl(s, SIOCG80211, &ireq) < 0) - goto end; - c = getchaninfo(s, ireq.i_val); - if (ireq.i_val != -1) { - printf(" channel %d", ireq.i_val); - if (verbose) - printf(" (%u)", c->ic_freq); + ireq.i_data = &chan; + ireq.i_len = sizeof(chan); + ireq.i_type = IEEE80211_IOC_CURCHAN; + if (ioctl(s, SIOCG80211, &ireq) < 0) { + /* fall back to legacy ioctl */ + ireq.i_data = NULL; + ireq.i_len = 0; + ireq.i_type = IEEE80211_IOC_CHANNEL; + if (ioctl(s, SIOCG80211, &ireq) < 0) + goto end; + getchaninfo(s); + mapchan(&chan, ireq.i_val, 0); + } + c = &chan; + if (c->ic_freq != IEEE80211_CHAN_ANY) { + printf(" channel %d", c->ic_ieee); + if (verbose) { + char buf[14]; + printf(" (%u Mhz%s)", c->ic_freq, + get_chaninfo(c, buf, sizeof(buf))); + } } else if (verbose) printf(" channel UNDEF"); @@ -2275,7 +2311,7 @@ } static void -set80211(int s, int type, int val, int len, u_int8_t *data) +set80211(int s, int type, int val, int len, void *data) { struct ieee80211req ireq; From owner-p4-projects@FreeBSD.ORG Sun Jan 21 20:48:09 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9A2D16A405; Sun, 21 Jan 2007 20:48:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 733CD16A401 for ; Sun, 21 Jan 2007 20:48:09 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4938813C457 for ; Sun, 21 Jan 2007 20:48:09 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0LKm9TH041148 for ; Sun, 21 Jan 2007 20:48:09 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LKm9da041145 for perforce@freebsd.org; Sun, 21 Jan 2007 20:48:09 GMT (envelope-from sam@freebsd.org) Date: Sun, 21 Jan 2007 20:48:09 GMT Message-Id: <200701212048.l0LKm9da041145@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 113265 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 20:48:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=113265 Change 113265 by sam@sam_ebb on 2007/01/21 20:47:59 line up S:N display in list scan; may want to go back to rssi until we have proper units conversion Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#59 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#59 (text+ko) ==== @@ -1262,12 +1262,12 @@ getchaninfo(s); ssidmax = verbose ? IEEE80211_NWID_LEN : 14; - printf("%-*.*s %-17.17s %4s %4s %-7s %3s %4s\n" + printf("%-*.*s %-17.17s %4s %4s %-7s %3s %4s\n" , ssidmax, ssidmax, "SSID" , "BSSID" , "CHAN" , "RATE" - , " S:N" + , " S:N" , "INT" , "CAPS" ); @@ -1278,7 +1278,7 @@ sr = (struct ieee80211req_scan_result *) cp; vp = (u_int8_t *)(sr+1); - printf("%-*.*s %s %3d %3dM %2d:%-2d %3d %-4.4s" + printf("%-*.*s %s %3d %3dM %3d:%-3d %3d %-4.4s" , ssidmax , copy_essid(ssid, ssidmax, vp, sr->isr_ssid_len) , ssid From owner-p4-projects@FreeBSD.ORG Sun Jan 21 21:02:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C7F916A403; Sun, 21 Jan 2007 21:02:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1F91016A402 for ; Sun, 21 Jan 2007 21:02:28 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0F7D313C441 for ; Sun, 21 Jan 2007 21:02:28 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0LL2R6e044516 for ; Sun, 21 Jan 2007 21:02:27 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LL2RuX044513 for perforce@freebsd.org; Sun, 21 Jan 2007 21:02:27 GMT (envelope-from sam@freebsd.org) Date: Sun, 21 Jan 2007 21:02:27 GMT Message-Id: <200701212102.l0LL2RuX044513@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 113266 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 21:02:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=113266 Change 113266 by sam@sam_ebb on 2007/01/21 21:02:07 turn on bg scanning Affected files ... .. //depot/projects/wifi/sys/dev/ral/rt2560.c#12 edit .. //depot/projects/wifi/sys/dev/ral/rt2661.c#6 edit Differences ... ==== //depot/projects/wifi/sys/dev/ral/rt2560.c#12 (text) ==== @@ -274,6 +274,7 @@ IEEE80211_C_TXPMGT | /* tx power management */ IEEE80211_C_SHPREAMBLE | /* short preamble supported */ IEEE80211_C_SHSLOT | /* short slot time supported */ + IEEE80211_C_BGSCAN | /* bg scanning support */ IEEE80211_C_WPA; /* 802.11i */ bands = 0; ==== //depot/projects/wifi/sys/dev/ral/rt2661.c#6 (text) ==== @@ -317,6 +317,7 @@ #ifdef notyet IEEE80211_C_WME | /* 802.11e */ #endif + IEEE80211_C_BGSCAN | /* bg scanning support */ IEEE80211_C_WPA; /* 802.11i */ bands = 0; From owner-p4-projects@FreeBSD.ORG Sun Jan 21 21:36:10 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3F3D16A401; Sun, 21 Jan 2007 21:36:10 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 85C5F16A402 for ; Sun, 21 Jan 2007 21:36:10 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 74A4413C45A for ; Sun, 21 Jan 2007 21:36:10 +0000 (UTC) (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 l0LLaA5n050963 for ; Sun, 21 Jan 2007 21:36:10 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LLaAlH050960 for perforce@freebsd.org; Sun, 21 Jan 2007 21:36:10 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 21 Jan 2007 21:36:10 GMT Message-Id: <200701212136.l0LLaAlH050960@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 113267 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 21:36:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=113267 Change 113267 by rdivacky@rdivacky_witten on 2007/01/21 21:36:03 Remove duplicate definition of linux user descriptor. Affected files ... .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#21 edit Differences ... ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#21 (text+ko) ==== @@ -72,18 +72,6 @@ extern struct sysentvec elf32_freebsd_sysvec; /* defined in i386/i386/elf_machdep.c */ -struct l_descriptor { - l_uint entry_number; - l_ulong 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_old_select_argv { l_int nfds; l_fd_set *readfds; @@ -861,7 +849,7 @@ { int error; struct i386_ldt_args ldt; - struct l_descriptor ld; + struct l_user_desc ld; union descriptor desc; if (uap->ptr == NULL) From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:24:12 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0671B16A405; Sun, 21 Jan 2007 22:24:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BCB5D16A400 for ; Sun, 21 Jan 2007 22:24:11 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AC43F13C45D for ; Sun, 21 Jan 2007 22:24:11 +0000 (UTC) (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 l0LMOBax060242 for ; Sun, 21 Jan 2007 22:24:11 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMOBio060239 for perforce@freebsd.org; Sun, 21 Jan 2007 22:24:11 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:24:11 GMT Message-Id: <200701212224.l0LMOBio060239@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 113269 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:24:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=113269 Change 113269 by millert@millert_macbook on 2007/01/21 22:23:46 Use strtok_r() not strtok() Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/matchpathcon.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/matchpathcon.c#4 (text+ko) ==== @@ -443,7 +443,7 @@ int pass, unsigned lineno) { int items, len, regerr, ret; - char *buf_p; + char *buf_p, *ptr; char *regex, *type, *context; const char *reg_buf; char *anchored_regex; @@ -459,9 +459,9 @@ if (*buf_p == '#' || *buf_p == 0) return 0; - regex = strtok(buf_p, " \t"); - type = strtok(NULL, " \t"); - context = strtok(NULL, " \t"); + regex = strtok_r(buf_p, " \t", &ptr); + type = strtok_r(NULL, " \t", &ptr); + context = strtok_r(NULL, " \t", &ptr); items = !!regex + !!type + !!context; if (items < 2) { myprintf("%s: line %d is missing fields, skipping\n", path, From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:26:16 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FB9516A404; Sun, 21 Jan 2007 22:26:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EE5C316A403 for ; Sun, 21 Jan 2007 22:26:15 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DE28013C428 for ; Sun, 21 Jan 2007 22:26:15 +0000 (UTC) (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 l0LMQFrL060394 for ; Sun, 21 Jan 2007 22:26:15 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMQFU2060391 for perforce@freebsd.org; Sun, 21 Jan 2007 22:26:15 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:26:15 GMT Message-Id: <200701212226.l0LMQFU2060391@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 113270 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:26:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=113270 Change 113270 by millert@millert_macbook on 2007/01/21 22:25:25 Remove M_EXTATTR, it is no longer used. This also means that M_LCTX movees to 106. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_malloc.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/malloc.h#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_malloc.c#3 (text+ko) ==== @@ -241,8 +241,7 @@ 0, KMZ_MALLOC, /* 103 M_MACPIPELABEL */ 0, KMZ_MALLOC, /* 104 M_MACTEMP */ 0, KMZ_MALLOC, /* 105 M_SBUF */ - 0, KMZ_MALLOC, /* 106 M_HFS_EXTATTR */ - 0, KMZ_MALLOC, /* 107 M_LCTX */ + 0, KMZ_MALLOC, /* 106 M_LCTX */ #undef SOS #undef SOX }; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/malloc.h#3 (text+ko) ==== @@ -199,7 +199,6 @@ #define M_MACPIPELABEL 103 /* MAC pipe labels */ #define M_MACTEMP 104 /* MAC framework */ #define M_SBUF 105 /* string buffers */ -#define M_EXTATTR 106 /* extended attribute */ #define M_LCTX 107 /* process login context */ @@ -332,8 +331,7 @@ "macpipelabel", /* 103 M_MACPIPELABEL */\ "mactemp", /* 104 M_MACTEMP */\ "sbuf", /* 105 M_SBUF */\ - "extattr", /* 106 M_EXTATTR */\ - "lctx", /* 107 M_LCTX */\ + "lctx", /* 106 M_LCTX */\ } struct kmemstats { From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:27:18 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D7A7C16A404; Sun, 21 Jan 2007 22:27:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9E36116A402 for ; Sun, 21 Jan 2007 22:27:17 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8CABD13C441 for ; Sun, 21 Jan 2007 22:27:17 +0000 (UTC) (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 l0LMRHm5060496 for ; Sun, 21 Jan 2007 22:27:17 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMRHoY060493 for perforce@freebsd.org; Sun, 21 Jan 2007 22:27:17 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:27:17 GMT Message-Id: <200701212227.l0LMRHoY060493@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 113271 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:27:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=113271 Change 113271 by millert@millert_macbook on 2007/01/21 22:27:14 If a process fails a MAC permission check when waiting for a child, do not return the entrypoint error code directly. Instead, just return ECHILD if there are no processes it is permitted to wait for. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_exit.c#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_exit.c#6 (text+ko) ==== @@ -686,8 +686,15 @@ continue; #ifdef MAC - if ((error = mac_proc_check_wait(kauth_cred_get(), p)) != 0) - return (error); + /* + * We can not return the MAC error back to userland as + * the caller would get non-standard error code. + * Instead, we will return ECHILD (see below) if there + * are no processes we are permitted to wait on. + */ + error = mac_proc_check_wait(kauth_cred_get(), p); + if (error) + continue; #endif nfound++; From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:28:19 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A120C16A40A; Sun, 21 Jan 2007 22:28:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4D1FA16A401 for ; Sun, 21 Jan 2007 22:28:19 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3C28E13C471 for ; Sun, 21 Jan 2007 22:28:19 +0000 (UTC) (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 l0LMSJpg060543 for ; Sun, 21 Jan 2007 22:28:19 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMSJTR060540 for perforce@freebsd.org; Sun, 21 Jan 2007 22:28:19 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:28:19 GMT Message-Id: <200701212228.l0LMSJTR060540@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 113272 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:28:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=113272 Change 113272 by millert@millert_macbook on 2007/01/21 22:27:59 Move the mac_system_check_acct() call before the vnode_put() so we don't have to do out own vnode locking. Brings the code more in line with FreeBSD. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_descrip.c#10 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_descrip.c#10 (text+ko) ==== @@ -1926,6 +1926,15 @@ tablefull("file"); return (ENFILE); } +#ifdef MAC + error = mac_file_check_create(proc_ucred(p)); + if (error) { + if (!locked) + proc_fdunlock(p); + return (error); + } +#endif + /* * Allocate a new file descriptor. * If the process has file descriptor zero open, add to the list @@ -1934,12 +1943,6 @@ */ proc_fdunlock(p); -#ifdef MAC - error = mac_file_check_create(proc_ucred(p)); - if (error) - return (error); -#endif - MALLOC_ZONE(fp, struct fileproc *, sizeof(struct fileproc), M_FILEPROC, M_WAITOK); MALLOC_ZONE(fg, struct fileglob *, sizeof(struct fileglob), M_FILEGLOB, M_WAITOK); bzero(fp, sizeof(struct fileproc)); From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:29:26 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BD1516A40A; Sun, 21 Jan 2007 22:29:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E53C316A404 for ; Sun, 21 Jan 2007 22:29:25 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 91D0413C45D for ; Sun, 21 Jan 2007 22:29:21 +0000 (UTC) (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 l0LMTLZc060650 for ; Sun, 21 Jan 2007 22:29:21 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMTLS7060647 for perforce@freebsd.org; Sun, 21 Jan 2007 22:29:21 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:29:21 GMT Message-Id: <200701212229.l0LMTLS7060647@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 113273 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:29:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=113273 Change 113273 by millert@millert_macbook on 2007/01/21 22:28:33 The call to mac_file_check_create() should be placed where the other checks are done. This makes the fdlock handling consistent. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_acct.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_acct.c#5 (text+ko) ==== @@ -167,6 +167,15 @@ NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_USERSPACE, uap->path, &context); if ((error = vn_open(&nd, FWRITE, 0))) return (error); +#ifdef MAC + error = mac_system_check_acct(vfs_context_ucred(&context), + nd.ni_vp); + if (error) { + vnode_put(nd.ni_vp); + vn_close(nd.ni_vp, FWRITE, kauth_cred_get(), p); + return (error); + } +#endif vnode_put(nd.ni_vp); if (nd.ni_vp->v_type != VREG) { @@ -175,17 +184,8 @@ } } #ifdef MAC - if (uap->path != USER_ADDR_NULL) { - vnode_lock(nd.ni_vp); - error = mac_system_check_acct(p->p_ucred, nd.ni_vp); - vnode_unlock(nd.ni_vp); - if (error) { - vn_close(nd.ni_vp, FWRITE, kauth_cred_get(), p); - return (error); - } - } else { - error = mac_system_check_acct(p->p_ucred, NULL); + error = mac_system_check_acct(vfs_context_ucred(&context), NULL); if (error) return (error); } From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:30:23 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C760616A40A; Sun, 21 Jan 2007 22:30:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6E39016A404 for ; Sun, 21 Jan 2007 22:30:23 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5D53D13C442 for ; Sun, 21 Jan 2007 22:30:23 +0000 (UTC) (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 l0LMUN1L060772 for ; Sun, 21 Jan 2007 22:30:23 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMUNMx060769 for perforce@freebsd.org; Sun, 21 Jan 2007 22:30:23 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:30:23 GMT Message-Id: <200701212230.l0LMUNMx060769@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 113274 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:30:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=113274 Change 113274 by millert@millert_macbook on 2007/01/21 22:29:39 Renumber M_LCTX and adjust M_LAST. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/malloc.h#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/malloc.h#4 (text+ko) ==== @@ -199,7 +199,7 @@ #define M_MACPIPELABEL 103 /* MAC pipe labels */ #define M_MACTEMP 104 /* MAC framework */ #define M_SBUF 105 /* string buffers */ -#define M_LCTX 107 /* process login context */ +#define M_LCTX 106 /* process login context */ #else /* BSD_KERNEL_PRIVATE */ @@ -220,7 +220,7 @@ #ifdef BSD_KERNEL_PRIVATE -#define M_LAST 108 /* Must be last type + 1 */ +#define M_LAST 107 /* Must be last type + 1 */ /* Strings corresponding to types of memory */ /* Must be in synch with the #defines above */ From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:30:24 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 014B616A4C9; Sun, 21 Jan 2007 22:30:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C15DE16A408 for ; Sun, 21 Jan 2007 22:30:23 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B0C8213C44B for ; Sun, 21 Jan 2007 22:30:23 +0000 (UTC) (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 l0LMUN9O060780 for ; Sun, 21 Jan 2007 22:30:23 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMUNPB060775 for perforce@freebsd.org; Sun, 21 Jan 2007 22:30:23 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:30:23 GMT Message-Id: <200701212230.l0LMUNPB060775@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 113275 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:30:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=113275 Change 113275 by millert@millert_macbook on 2007/01/21 22:30:09 Use existing cred passed in to socket read/write functions instead of looking up the cred via curren_proc(). Also replace a proc_ucred(current_proc()) with kauth_cred_get(). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sys_socket.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sys_socket.c#5 (text+ko) ==== @@ -112,7 +112,7 @@ soo_read( struct fileproc *fp, struct uio *uio, - __unused kauth_cred_t cred, + kauth_cred_t cred, __unused int flags, __unused struct proc *p) { @@ -134,7 +134,7 @@ } #ifdef MAC_SOCKET SOCK_LOCK(so); - error = mac_socket_check_receive(proc_ucred(p), so); + error = mac_socket_check_receive(cred, so); SOCK_UNLOCK(so); if (error) return (error); @@ -151,7 +151,7 @@ soo_write( struct fileproc *fp, struct uio *uio, - __unused kauth_cred_t cred, + kauth_cred_t cred, __unused int flags, struct proc *procp) { @@ -171,7 +171,7 @@ #ifdef MAC_SOCKET SOCK_LOCK(so); - error = mac_socket_check_send(proc_ucred(procp), so); + error = mac_socket_check_send(cred, so); SOCK_UNLOCK(so); if (error) return (error); @@ -419,7 +419,7 @@ #ifdef MAC_SOCKET SOCK_LOCK(so); - stat = mac_socket_check_stat(proc_ucred(current_proc()), so); + stat = mac_socket_check_stat(kauth_cred_get(), so); SOCK_UNLOCK(so); if (stat) return (stat); From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:31:26 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D73B016A406; Sun, 21 Jan 2007 22:31:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9DE8D16A404 for ; Sun, 21 Jan 2007 22:31:25 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8D29913C457 for ; Sun, 21 Jan 2007 22:31:25 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0LMVPM0061505 for ; Sun, 21 Jan 2007 22:31:25 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMVPUl061489 for perforce@freebsd.org; Sun, 21 Jan 2007 22:31:25 GMT (envelope-from sam@freebsd.org) Date: Sun, 21 Jan 2007 22:31:25 GMT Message-Id: <200701212231.l0LMVPUl061489@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 113276 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:31:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=113276 Change 113276 by sam@sam_ebb on 2007/01/21 22:31:13 enable bg scanning Affected files ... .. //depot/projects/wifi/sys/dev/usb/if_ural.c#14 edit Differences ... ==== //depot/projects/wifi/sys/dev/usb/if_ural.c#14 (text+ko) ==== @@ -464,13 +464,15 @@ /* set device capabilities */ ic->ic_caps = - IEEE80211_C_IBSS | /* IBSS mode supported */ - IEEE80211_C_MONITOR | /* monitor mode supported */ - IEEE80211_C_HOSTAP | /* HostAp mode supported */ - IEEE80211_C_TXPMGT | /* tx power management */ - IEEE80211_C_SHPREAMBLE | /* short preamble supported */ - IEEE80211_C_SHSLOT | /* short slot time supported */ - IEEE80211_C_WPA; /* 802.11i */ + IEEE80211_C_IBSS /* IBSS mode supported */ + | IEEE80211_C_MONITOR /* monitor mode supported */ + | IEEE80211_C_HOSTAP /* HostAp mode supported */ + | IEEE80211_C_TXPMGT /* tx power management */ + | IEEE80211_C_SHPREAMBLE /* short preamble supported */ + | IEEE80211_C_SHSLOT /* short slot time supported */ + | IEEE80211_C_BGSCAN /* bg scanning supportd */ + | IEEE80211_C_WPA /* 802.11i */ + ; if (sc->rf_rev == RAL_RF_5222) { /* set supported .11a rates */ From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:31:26 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C15A16A4FA; Sun, 21 Jan 2007 22:31:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F400316A488 for ; Sun, 21 Jan 2007 22:31:25 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E140B13C461 for ; Sun, 21 Jan 2007 22:31:25 +0000 (UTC) (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 l0LMVP5i061528 for ; Sun, 21 Jan 2007 22:31:25 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMVPL8061512 for perforce@freebsd.org; Sun, 21 Jan 2007 22:31:25 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:31:25 GMT Message-Id: <200701212231.l0LMVPL8061512@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 113277 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:31:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=113277 Change 113277 by millert@millert_macbook on 2007/01/21 22:31:18 Label entries in volfs as volfs_t Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/filesystem.te#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/filesystem.te#5 (text+ko) ==== @@ -43,6 +43,10 @@ # # Non-persistent/pseudo filesystems # +type volfs_t; +fs_type(volfs_t) +genfscon volfs / gen_context(system_u:object_r:volfs_t,s0) + type bdev_t; fs_type(bdev_t) genfscon bdev / gen_context(system_u:object_r:bdev_t,s0) From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:32:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E303916A408; Sun, 21 Jan 2007 22:32:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BCFC816A406 for ; Sun, 21 Jan 2007 22:32:27 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AC38113C45D for ; Sun, 21 Jan 2007 22:32:27 +0000 (UTC) (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 l0LMWRFD061841 for ; Sun, 21 Jan 2007 22:32:27 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMWRZL061838 for perforce@freebsd.org; Sun, 21 Jan 2007 22:32:27 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:32:27 GMT Message-Id: <200701212232.l0LMWRZL061838@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 113278 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:32:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=113278 Change 113278 by millert@millert_macbook on 2007/01/21 22:31:53 buf is guaranteed to be NUL-terminated by vsnprintf() so there is no need to terminate it manually. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/devfs/devfs_tree.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/devfs/devfs_tree.c#8 (text+ko) ==== @@ -1184,11 +1184,10 @@ va_start(ap, fmt); vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); - #ifdef MAC - bcopy(buf, buff, sizeof(buff)); - buff[sizeof(buff)-1] = 0; + strcpy(buff, buf); #endif + name = NULL; for(i=strlen(buf); i>0; i--) From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:32:29 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40BAB16A51C; Sun, 21 Jan 2007 22:32:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0690C16A4F5 for ; Sun, 21 Jan 2007 22:32:28 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0BD8013C465 for ; Sun, 21 Jan 2007 22:32:28 +0000 (UTC) (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 l0LMWR5D061850 for ; Sun, 21 Jan 2007 22:32:27 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMWRkR061844 for perforce@freebsd.org; Sun, 21 Jan 2007 22:32:27 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:32:27 GMT Message-Id: <200701212232.l0LMWRkR061844@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 113279 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:32:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=113279 Change 113279 by millert@millert_macbook on 2007/01/21 22:32:22 No changes other than copyright, revert to vendor version. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/fdesc/fdesc_vnops.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/fdesc/fdesc_vnops.c#7 (text+ko) ==== @@ -66,12 +66,6 @@ * @(#)fdesc_vnops.c 8.17 (Berkeley) 5/22/95 * */ -/* - * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce - * 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. - */ /* * /dev/fd Filesystem From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:33:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1AEA516A41F; Sun, 21 Jan 2007 22:33:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E449116A403 for ; Sun, 21 Jan 2007 22:33:31 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 520D013C4D1 for ; Sun, 21 Jan 2007 22:33:30 +0000 (UTC) (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 l0LMXTjo062418 for ; Sun, 21 Jan 2007 22:33:29 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMXTgK062409 for perforce@freebsd.org; Sun, 21 Jan 2007 22:33:29 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:33:29 GMT Message-Id: <200701212233.l0LMXTgK062409@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 113280 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:33:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=113280 Change 113280 by millert@millert_macbook on 2007/01/21 22:32:55 In __mac_mount(), if the copyinstr() fails jump to out1 instead of just returning--we need the vnode_put() and nameidone() calls for proper cleanup Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_syscalls.c#19 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_syscalls.c#19 (text+ko) ==== @@ -248,7 +248,7 @@ error = copyinstr(uap->type, fstypename, MFSNAMELEN, &dummy); if (error) - return (error); + goto out1; if (uap->flags & MNT_UPDATE) { if ((vp->v_flag & VROOT) == 0) { From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:33:33 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66A0516A4C9; Sun, 21 Jan 2007 22:33:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EFEC116A40E for ; Sun, 21 Jan 2007 22:33:31 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 92C0F13C4B7 for ; Sun, 21 Jan 2007 22:33:30 +0000 (UTC) (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 l0LMXUsn062428 for ; Sun, 21 Jan 2007 22:33:30 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMXTm7062422 for perforce@freebsd.org; Sun, 21 Jan 2007 22:33:29 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:33:29 GMT Message-Id: <200701212233.l0LMXTm7062422@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 113281 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:33:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=113281 Change 113281 by millert@millert_macbook on 2007/01/21 22:33:13 Add a missing vnode_put() if mac_mount_check_umount() denies access. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_syscalls.c#20 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_syscalls.c#20 (text+ko) ==== @@ -842,8 +842,10 @@ #ifdef MAC error = mac_mount_check_umount(vfs_context_ucred(&context), mp); - if (error != 0) + if (error != 0) { + vnode_put(vp); return (error); + } #endif /* * Must be the root of the filesystem From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:34:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33CE616A405; Sun, 21 Jan 2007 22:34:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EB57716A402 for ; Sun, 21 Jan 2007 22:34:31 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DA34913C43E for ; Sun, 21 Jan 2007 22:34:31 +0000 (UTC) (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 l0LMYVi1063536 for ; Sun, 21 Jan 2007 22:34:31 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMYVoe063533 for perforce@freebsd.org; Sun, 21 Jan 2007 22:34:31 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:34:31 GMT Message-Id: <200701212234.l0LMYVoe063533@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 113282 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:34:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=113282 Change 113282 by millert@millert_macbook on 2007/01/21 22:34:12 Remove a needless deviation from vendor code. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_syscalls.c#21 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_syscalls.c#21 (text+ko) ==== @@ -2216,11 +2216,10 @@ dvp = nd.ni_dvp; vp = nd.ni_vp; - VATTR_INIT(&va); - VATTR_SET(&va, va_type, VLNK); - VATTR_SET(&va, va_mode, ACCESSPERMS & ~p->p_fd->fd_cmask); - if (vp == NULL) { + VATTR_INIT(&va); + VATTR_SET(&va, va_type, VLNK); + VATTR_SET(&va, va_mode, ACCESSPERMS & ~p->p_fd->fd_cmask); #ifdef MAC error = mac_vnode_check_create(vfs_context_ucred(&context), dvp, &nd.ni_cnd, &va); From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:35:34 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C14B16A403; Sun, 21 Jan 2007 22:35:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C6B5E16A400 for ; Sun, 21 Jan 2007 22:35:33 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B5BDF13C455 for ; Sun, 21 Jan 2007 22:35:33 +0000 (UTC) (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 l0LMZXng064154 for ; Sun, 21 Jan 2007 22:35:33 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMZXi6064151 for perforce@freebsd.org; Sun, 21 Jan 2007 22:35:33 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:35:33 GMT Message-Id: <200701212235.l0LMZXi6064151@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 113283 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:35:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=113283 Change 113283 by millert@millert_macbook on 2007/01/21 22:34:34 Use vfs_context_ucred() where it makes sense. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_vnops.c#9 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_vnops.c#9 (text+ko) ==== @@ -857,7 +857,7 @@ context.vc_ucred = p->p_ucred; /* XXX kauth_cred_get() ??? */ #ifdef MAC - error = mac_vnode_check_ioctl(context.vc_ucred, vp, com); + error = mac_vnode_check_ioctl(vfs_context_ucred(&context), vp, com); if (error) goto out; #endif @@ -1025,7 +1025,7 @@ context.vc_ucred = p->p_ucred; /* XXX kauth_cred_get() ??? */ #ifdef MAC - error = mac_vnode_check_kqfilter(kauth_cred_get(), + error = mac_vnode_check_kqfilter(vfs_context_ucred(&context), fp->f_fglob->fg_cred, kn, vp); if (error) { (void)vnode_put(vp); From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:35:34 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D75316A4C8; Sun, 21 Jan 2007 22:35:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0E26E16A404 for ; Sun, 21 Jan 2007 22:35:34 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id F0F5713C459 for ; Sun, 21 Jan 2007 22:35:33 +0000 (UTC) (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 l0LMZXT4064161 for ; Sun, 21 Jan 2007 22:35:33 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMZX2p064157 for perforce@freebsd.org; Sun, 21 Jan 2007 22:35:33 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:35:33 GMT Message-Id: <200701212235.l0LMZX2p064157@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 113284 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:35:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=113284 Change 113284 by millert@millert_macbook on 2007/01/21 22:34:52 Use vfs_context_ucred() Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vm/dp_backing_file.c#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vm/dp_backing_file.c#6 (text+ko) ==== @@ -220,7 +220,7 @@ goto swapon_bailout; #ifdef MAC vnode_lock(vp); - error = mac_system_check_swapon(p->p_ucred, vp); + error = mac_system_check_swapon(vfs_context_ucred(&context), vp); vnode_unlock(vp); if (error) goto swapon_bailout; @@ -361,7 +361,7 @@ } #ifdef MAC vnode_lock(vp); - error = mac_system_check_swapoff(p->p_ucred, vp); + error = mac_system_check_swapoff(vfs_context_ucred(&context), vp); vnode_unlock(vp); if (error) goto swapoff_bailout; From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:35:34 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A525716A591; Sun, 21 Jan 2007 22:35:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6320C16A507 for ; Sun, 21 Jan 2007 22:35:34 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5116E13C471 for ; Sun, 21 Jan 2007 22:35:34 +0000 (UTC) (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 l0LMZYSU064168 for ; Sun, 21 Jan 2007 22:35:34 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMZYAu064164 for perforce@freebsd.org; Sun, 21 Jan 2007 22:35:34 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:35:34 GMT Message-Id: <200701212235.l0LMZYAu064164@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 113285 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:35:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=113285 Change 113285 by millert@millert_macbook on 2007/01/21 22:35:16 Remove old debugging printfs. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_kmsg.c#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_kmsg.c#6 (text+ko) ==== @@ -914,9 +914,6 @@ port = (ipc_port_t) kmsg->ikm_header->msgh_remote_port; assert(IP_VALID(port)); - if ((option & ~(MACH_SEND_TIMEOUT|MACH_SEND_ALWAYS)) != 0) - printf("ipc_kmsg_send: bad option 0x%x\n", option); - ip_lock(port); if (port->ip_receiver == ipc_space_kernel) { @@ -2171,7 +2168,6 @@ ipc_port_request_index_t request; if (!space->is_active) { - printf("ipc_kmsg_copyout_header: dead space\n"); is_write_unlock(space); return (MACH_RCV_HEADER_ERROR| MACH_MSG_IPC_SPACE); @@ -2181,7 +2177,6 @@ notify_port = ipc_port_lookup_notify(space, notify); if (notify_port == IP_NULL) { - printf("ipc_kmsg_copyout_header: no notify port\n"); is_write_unlock(space); return MACH_RCV_INVALID_NOTIFY; } @@ -2236,15 +2231,12 @@ if (kr != KERN_SUCCESS) { /* space is unlocked */ - if (kr == KERN_RESOURCE_SHORTAGE) { - printf("ipc_kmsg_copyout_header: can't grow kernel ipc space\n"); + if (kr == KERN_RESOURCE_SHORTAGE) return (MACH_RCV_HEADER_ERROR| MACH_MSG_IPC_KERNEL); - } else { - printf("ipc_kmsg_copyout_header: can't grow user ipc space\n"); + else return (MACH_RCV_HEADER_ERROR| MACH_MSG_IPC_SPACE); - } } /* space is locked again; start over */ @@ -2282,11 +2274,9 @@ kr = ipc_port_dngrow(reply, ITS_SIZE_NONE); /* port is unlocked */ - if (kr != KERN_SUCCESS) { - printf("ipc_kmsg_copyout_header: can't grow kernel ipc space2\n"); + if (kr != KERN_SUCCESS) return (MACH_RCV_HEADER_ERROR| MACH_MSG_IPC_KERNEL); - } is_write_lock(space); continue; @@ -2323,7 +2313,6 @@ is_read_lock(space); if (!space->is_active) { - printf("ipc_kmsg_copyout_header: dead space2\n"); is_read_unlock(space); return MACH_RCV_HEADER_ERROR|MACH_MSG_IPC_SPACE; } @@ -2334,13 +2323,11 @@ /* must check notify even though it won't be used */ if ((entry = ipc_entry_lookup(space, notify)) == IE_NULL) { - printf("ipc_kmsg_copyout_header: ipc_entry_lookup failed\n"); is_read_unlock(space); return MACH_RCV_INVALID_NOTIFY; } if ((entry->ie_bits & MACH_PORT_TYPE_RECEIVE) == 0) { - printf("ipc_kmsg_copyout_header: MACH_PORT_TYPE_RECEIVE not set!\n"); is_read_unlock(space); return MACH_RCV_INVALID_NOTIFY; } @@ -2922,10 +2909,8 @@ mach_msg_return_t mr; mr = ipc_kmsg_copyout_header(kmsg->ikm_header, space, notify); - if (mr != MACH_MSG_SUCCESS) { - printf("ipc_kmsg_copyout: ipc_kmsg_copyout_header failed: %d\n", mr); + if (mr != MACH_MSG_SUCCESS) return mr; - } if (kmsg->ikm_header->msgh_bits & MACH_MSGH_BITS_COMPLEX) { mr = ipc_kmsg_copyout_body(kmsg, space, map, slist); From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:36:36 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F2C716A46F; Sun, 21 Jan 2007 22:36:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3F01816A412 for ; Sun, 21 Jan 2007 22:36:36 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1EE5A13C474 for ; Sun, 21 Jan 2007 22:36:36 +0000 (UTC) (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 l0LMaaQw064237 for ; Sun, 21 Jan 2007 22:36:36 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMaZLw064234 for perforce@freebsd.org; Sun, 21 Jan 2007 22:36:35 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:36:35 GMT Message-Id: <200701212236.l0LMaZLw064234@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 113286 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:36:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=113286 Change 113286 by millert@millert_macbook on 2007/01/21 22:35:36 Reduce vendor diffs. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_right.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_right.c#4 (text+ko) ==== @@ -1491,7 +1491,6 @@ task_t self = current_task(); int rc; #endif - int dead; bits = entry->ie_bits; @@ -1637,15 +1636,12 @@ port = (ipc_port_t) entry->ie_object; assert(port != IP_NULL); - dead = ipc_right_check(space, port, name, entry); + if (ipc_right_check(space, port, name, entry)) { + bits = entry->ie_bits; + goto copy_dead; + } /* port is locked and active */ - if (dead) - { - bits = entry->ie_bits; - goto copy_dead; - } - #ifdef MAC tasklabel_lock(self); rc = mac_port_check_copy_send(&self->maclabel, &port->ip_label); @@ -1692,14 +1688,12 @@ port = (ipc_port_t) entry->ie_object; assert(port != IP_NULL); - dead = ipc_right_check(space, port, name, entry); + if (ipc_right_check(space, port, name, entry)) { + bits = entry->ie_bits; + goto move_dead; + } /* port is locked and active */ - if (dead) { - bits = entry->ie_bits; - goto move_dead; - } - #ifdef MAC tasklabel_lock(self); rc = mac_port_check_move_send(&self->maclabel, &port->ip_label); @@ -1770,14 +1764,12 @@ port = (ipc_port_t) entry->ie_object; assert(port != IP_NULL); - dead = ipc_right_check(space, port, name, entry); + if (ipc_right_check(space, port, name, entry)) { + bits = entry->ie_bits; + goto move_dead; + } /* port is locked and active */ - if (dead) { - bits = entry->ie_bits; - goto move_dead; - } - #ifdef MAC tasklabel_lock(self); rc = mac_port_check_move_send_once(&self->maclabel, From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:36:36 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C64D716A401; Sun, 21 Jan 2007 22:36:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A2A0B16A51C for ; Sun, 21 Jan 2007 22:36:36 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 72DC413C478 for ; Sun, 21 Jan 2007 22:36:36 +0000 (UTC) (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 l0LMaaxQ064244 for ; Sun, 21 Jan 2007 22:36:36 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMaabu064240 for perforce@freebsd.org; Sun, 21 Jan 2007 22:36:36 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:36:36 GMT Message-Id: <200701212236.l0LMaabu064240@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 113287 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:36:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=113287 Change 113287 by millert@millert_macbook on 2007/01/21 22:35:57 Add missing space in avc log message. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#17 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#17 (text+ko) ==== @@ -651,7 +651,7 @@ vp->v_mount->mnt_vfsstat.f_mntonname); #else if (vp != NULL) { - audit_log_format(ab, "mountpoint=%s,", + audit_log_format(ab, " mountpoint=%s,", vp->v_mount->mnt_vfsstat.f_mntonname); #endif if (path == NULL) { From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:36:37 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C01B16A5BE; Sun, 21 Jan 2007 22:36:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0E8C316A59D for ; Sun, 21 Jan 2007 22:36:36 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C5CE813C47E for ; Sun, 21 Jan 2007 22:36:36 +0000 (UTC) (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 l0LMaa5o064250 for ; Sun, 21 Jan 2007 22:36:36 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMaaZH064247 for perforce@freebsd.org; Sun, 21 Jan 2007 22:36:36 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:36:36 GMT Message-Id: <200701212236.l0LMaaZH064247@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 113288 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:36:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=113288 Change 113288 by millert@millert_macbook on 2007/01/21 22:36:34 #ifdef out dead code Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#24 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#24 (text+ko) ==== @@ -164,6 +164,7 @@ mac_labelzone_free(label); } +#ifndef __APPLE__ void mac_vnode_label_destroy(struct vnode *vp) { @@ -171,6 +172,7 @@ mac_vnode_label_free(vp->v_label); vp->v_label = NULL; } +#endif void mac_vnode_label_copy(struct label *src, struct label *dest) From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:37:39 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C72EF16A40D; Sun, 21 Jan 2007 22:37:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A550216A409 for ; Sun, 21 Jan 2007 22:37:38 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9478713C45B for ; Sun, 21 Jan 2007 22:37:38 +0000 (UTC) (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 l0LMbcKH064431 for ; Sun, 21 Jan 2007 22:37:38 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMbcFR064428 for perforce@freebsd.org; Sun, 21 Jan 2007 22:37:38 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:37:38 GMT Message-Id: <200701212237.l0LMbcFR064428@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 113289 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:37:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=113289 Change 113289 by millert@millert_macbook on 2007/01/21 22:37:00 Deal with waitpid() getting interrupted by a signal. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/IPC.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/IPC.c#2 (text+ko) ==== @@ -68,8 +68,11 @@ /* Get the exit status */ if (anItem) { aPID = StartupItemGetPID(anItem); - if (aPID > 0) - rPID = waitpid(aPID, &aStatus, 0); + if (aPID > 0) { + do { + rPID = waitpid(aPID, &aStatus, 0); + } while (rPID == -1 && errno == EINTR); + } } if (aStartupContext) { --aStartupContext->aRunningCount; From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:37:39 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4730D16A51C; Sun, 21 Jan 2007 22:37:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0936716A4E1 for ; Sun, 21 Jan 2007 22:37:39 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E951013C474 for ; Sun, 21 Jan 2007 22:37:38 +0000 (UTC) (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 l0LMbcEZ064438 for ; Sun, 21 Jan 2007 22:37:38 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMbcZJ064434 for perforce@freebsd.org; Sun, 21 Jan 2007 22:37:38 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:37:38 GMT Message-Id: <200701212237.l0LMbcZJ064434@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 113290 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:37:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=113290 Change 113290 by millert@millert_macbook on 2007/01/21 22:37:18 Replace project builder Makefiles with a configure-generated one. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/Makefile#3 (text+ko) ==== @@ -1,41 +1,830 @@ +# Makefile.in generated by automake 1.6.3 from Makefile.am. +# src/Makefile. Generated from Makefile.in by configure. + +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + include ../../../Makeconfig +include ../../build/Mig.mk + +SHELL = /bin/sh + +srcdir = . +top_srcdir = .. + +prefix = +exec_prefix = ${prefix} + +bindir = ${exec_prefix}/bin +sbindir = ${exec_prefix}/sbin +libexecdir = ${exec_prefix}/libexec +datadir = ${prefix}/share +sysconfdir = ${prefix}/etc +sharedstatedir = ${prefix}/com +localstatedir = ${prefix}/var +libdir = ${exec_prefix}/lib +infodir = ${prefix}/info +mandir = ${prefix}/man +includedir = ${prefix}/include +oldincludedir = /usr/include +pkgdatadir = $(datadir)/launchd +pkglibdir = $(libdir)/launchd +pkgincludedir = $(includedir)/launchd +top_builddir = .. + +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = /usr/bin/install -c +INSTALL_PROGRAM = ${INSTALL} +INSTALL_DATA = ${INSTALL} -m 644 +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_SCRIPT = ${INSTALL} +INSTALL_HEADER = $(INSTALL_DATA) +transform = s,x,x, +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : + +EXEEXT = +OBJEXT = o +PATH_SEPARATOR = : +AMTAR = tar +AWK = awk +CC = gcc +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s +PACKAGE = launchd +RANLIB = ranlib +STRIP = +VERSION = 1.0 +am__include = include +am__quote = +install_sh = install +AM_CFLAGS = -no-cpp-precomp -F/System/Library/PrivateFrameworks -Wall -W -Wshadow -Wpadded -Werror -fconstant-cfstrings + +sbin_SCRIPTS = service + +noinst_LIBRARIES = liblaunch.a liblaunch_profile.a + +bin_PROGRAMS = launchctl wait4path +sbin_PROGRAMS = launchd SystemStarter launchd_debugd +libexec_PROGRAMS = ConsoleMessage register_mach_bootstrap_servers StartupItemContext launchproxy + +#sysconf_DATA = hostconfig rc rc.common rc.netboot rc.shutdown +sysconf_DATA = rc + +ConsoleMessage_LDFLAGS = -framework CoreFoundation + +launchctl_LDFLAGS = -framework CoreFoundation -weak_library /usr/lib/libedit.dylib + +register_mach_bootstrap_servers_LDFLAGS = -framework CoreFoundation + +launchd_debugd_CFLAGS = -mdynamic-no-pic $(AM_CFLAGS) +launchd_debugd_SOURCES = launchdebugd.c + +liblaunch_a_SOURCES = liblaunch.c + +liblaunch_profile_a_CFLAGS = -pg $(AM_CFLAGS) +liblaunch_profile_a_SOURCES = liblaunch.c + +SystemStarter_CFLAGS = -mdynamic-no-pic $(AM_CFLAGS) +SystemStarter_LDFLAGS = -framework CoreFoundation +SystemStarter_SOURCES = StartupItems.c IPC.c SystemStarter.c + +launchd_CFLAGS = -DPID1_REAP_ADOPTED_CHILDREN -mdynamic-no-pic $(AM_CFLAGS) -Wno-unused-parameter +launchd_LDFLAGS = -lbsm +launchd_SOURCES = launchd.c init.c bootstrap.c lists.c rpc_services.c bootstrapServer.c + +launchproxy_LDFLAGS = -weak_framework Security + +CLEANFILES = bootstrap.h bootstrapServer.c bootstrapUser.c + +man1_MANS = wait4path.1 launchctl.1 + +man5_MANS = launchd.plist.5 launchd.conf.5 + +man8_MANS = ConsoleMessage.8 StartupItemContext.8 SystemStarter.8 init.8 rc.8 launchd.8 service.8 launchproxy.8 launchd_debugd.8 + +STARTUPITEMS = $(basename $(notdir $(wildcard $(srcdir)/StartupItems/*.plist))) +subdir = src +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = +LIBRARIES = $(noinst_LIBRARIES) + +liblaunch_a_AR = $(AR) cru +liblaunch_a_LIBADD = +am_liblaunch_a_OBJECTS = liblaunch.$(OBJEXT) +liblaunch_a_OBJECTS = $(am_liblaunch_a_OBJECTS) +liblaunch_profile_a_AR = $(AR) cru +liblaunch_profile_a_LIBADD = +am_liblaunch_profile_a_OBJECTS = liblaunch_profile_a-liblaunch.$(OBJEXT) +liblaunch_profile_a_OBJECTS = $(am_liblaunch_profile_a_OBJECTS) +bin_PROGRAMS = launchctl$(EXEEXT) wait4path$(EXEEXT) +libexec_PROGRAMS = ConsoleMessage$(EXEEXT) \ + register_mach_bootstrap_servers$(EXEEXT) \ + StartupItemContext$(EXEEXT) launchproxy$(EXEEXT) +sbin_PROGRAMS = launchd$(EXEEXT) SystemStarter$(EXEEXT) \ + launchd_debugd$(EXEEXT) +PROGRAMS = $(bin_PROGRAMS) # $(libexec_PROGRAMS) $(sbin_PROGRAMS) + +ConsoleMessage_SOURCES = ConsoleMessage.c +ConsoleMessage_OBJECTS = ConsoleMessage.$(OBJEXT) +ConsoleMessage_LDADD = $(LDADD) +ConsoleMessage_DEPENDENCIES = +StartupItemContext_SOURCES = StartupItemContext.c +StartupItemContext_OBJECTS = StartupItemContext.$(OBJEXT) +StartupItemContext_LDADD = $(LDADD) +StartupItemContext_DEPENDENCIES = +StartupItemContext_LDFLAGS = +am_SystemStarter_OBJECTS = SystemStarter-StartupItems.$(OBJEXT) \ + SystemStarter-IPC.$(OBJEXT) \ + SystemStarter-SystemStarter.$(OBJEXT) +SystemStarter_OBJECTS = $(am_SystemStarter_OBJECTS) +SystemStarter_LDADD = $(LDADD) +SystemStarter_DEPENDENCIES = +launchctl_SOURCES = launchctl.c +launchctl_OBJECTS = launchctl.$(OBJEXT) +launchctl_LDADD = $(LDADD) +launchctl_DEPENDENCIES = +am_launchd_OBJECTS = launchd-launchd.$(OBJEXT) launchd-init.$(OBJEXT) \ + launchd-bootstrap.$(OBJEXT) launchd-lists.$(OBJEXT) \ + launchd-rpc_services.$(OBJEXT) \ + launchd-bootstrapServer.$(OBJEXT) +launchd_OBJECTS = $(am_launchd_OBJECTS) +launchd_LDADD = $(LDADD) +launchd_DEPENDENCIES = +am_launchd_debugd_OBJECTS = launchd_debugd-launchdebugd.$(OBJEXT) +launchd_debugd_OBJECTS = $(am_launchd_debugd_OBJECTS) +launchd_debugd_LDADD = $(LDADD) +launchd_debugd_DEPENDENCIES = +launchd_debugd_LDFLAGS = +launchproxy_SOURCES = launchproxy.c +launchproxy_OBJECTS = launchproxy.$(OBJEXT) +launchproxy_LDADD = $(LDADD) +launchproxy_DEPENDENCIES = +register_mach_bootstrap_servers_SOURCES = \ + register_mach_bootstrap_servers.c +register_mach_bootstrap_servers_OBJECTS = \ + register_mach_bootstrap_servers.$(OBJEXT) +register_mach_bootstrap_servers_LDADD = $(LDADD) +register_mach_bootstrap_servers_DEPENDENCIES = +wait4path_SOURCES = wait4path.c +wait4path_OBJECTS = wait4path.$(OBJEXT) +wait4path_LDADD = $(LDADD) +wait4path_DEPENDENCIES = +wait4path_LDFLAGS = +SCRIPTS = $(sbin_SCRIPTS) + + +DEFS = -DHAVE_CONFIG_H +DEFAULT_INCLUDES = -I. -I$(srcdir) -I. +CPPFLAGS = +LDFLAGS = +LIBS = +depcomp = $(SHELL) $(top_srcdir)/depcomp +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +CFLAGS = -g -O2 +DIST_SOURCES = $(liblaunch_a_SOURCES) $(liblaunch_profile_a_SOURCES) \ + ConsoleMessage.c StartupItemContext.c $(SystemStarter_SOURCES) \ + launchctl.c $(launchd_SOURCES) $(launchd_debugd_SOURCES) \ + launchproxy.c register_mach_bootstrap_servers.c wait4path.c + +NROFF = nroff +MANS = $(man1_MANS) $(man5_MANS) $(man8_MANS) +DATA = $(sysconf_DATA) + +DIST_COMMON = Makefile.am Makefile.in config.h.in +SOURCES = $(liblaunch_a_SOURCES) $(liblaunch_profile_a_SOURCES) ConsoleMessage.c StartupItemContext.c $(SystemStarter_SOURCES) launchctl.c $(launchd_SOURCES) $(launchd_debugd_SOURCES) launchproxy.c register_mach_bootstrap_servers.c wait4path.c -NAME = launchd +all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-am + +.SUFFIXES: +.SUFFIXES: .c .o .obj + +AR = ar + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) +liblaunch.a: $(liblaunch_a_OBJECTS) $(liblaunch_a_DEPENDENCIES) + -rm -f liblaunch.a + $(liblaunch_a_AR) liblaunch.a $(liblaunch_a_OBJECTS) $(liblaunch_a_LIBADD) + $(RANLIB) liblaunch.a +liblaunch_profile_a-liblaunch.$(OBJEXT): liblaunch.c +liblaunch_profile.a: $(liblaunch_profile_a_OBJECTS) $(liblaunch_profile_a_DEPENDENCIES) + -rm -f liblaunch_profile.a + $(liblaunch_profile_a_AR) liblaunch_profile.a $(liblaunch_profile_a_OBJECTS) $(liblaunch_profile_a_LIBADD) + $(RANLIB) liblaunch_profile.a +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ + $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ + else :; fi; \ + done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ + rm -f $(DESTDIR)$(bindir)/$$f; \ + done + +clean-binPROGRAMS: + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) +libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +install-libexecPROGRAMS: $(libexec_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(libexecdir) + @list='$(libexec_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \ + $(INSTALL_PROGRAM_ENV) $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f; \ + else :; fi; \ + done + +uninstall-libexecPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(libexec_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \ + rm -f $(DESTDIR)$(libexecdir)/$$f; \ + done + +clean-libexecPROGRAMS: + -test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS) +sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +install-sbinPROGRAMS: $(sbin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(sbindir) + @list='$(sbin_PROGRAMS)'; for p in $$list; do \ + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + if test -f $$p \ + ; then \ + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \ + $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f; \ + else :; fi; \ + done + +uninstall-sbinPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(sbin_PROGRAMS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \ + rm -f $(DESTDIR)$(sbindir)/$$f; \ + done + +clean-sbinPROGRAMS: + -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS) +ConsoleMessage$(EXEEXT): $(ConsoleMessage_OBJECTS) $(ConsoleMessage_DEPENDENCIES) + @rm -f ConsoleMessage$(EXEEXT) + $(LINK) $(ConsoleMessage_LDFLAGS) $(ConsoleMessage_OBJECTS) $(ConsoleMessage_LDADD) $(LIBS) +StartupItemContext$(EXEEXT): $(StartupItemContext_OBJECTS) $(StartupItemContext_DEPENDENCIES) + @rm -f StartupItemContext$(EXEEXT) + $(LINK) $(StartupItemContext_LDFLAGS) $(StartupItemContext_OBJECTS) $(StartupItemContext_LDADD) $(LIBS) +SystemStarter-StartupItems.$(OBJEXT): StartupItems.c +SystemStarter-IPC.$(OBJEXT): IPC.c +SystemStarter-SystemStarter.$(OBJEXT): SystemStarter.c +SystemStarter$(EXEEXT): $(SystemStarter_OBJECTS) $(SystemStarter_DEPENDENCIES) + @rm -f SystemStarter$(EXEEXT) + $(LINK) $(SystemStarter_LDFLAGS) $(SystemStarter_OBJECTS) $(SystemStarter_LDADD) $(LIBS) +launchctl$(EXEEXT): $(launchctl_OBJECTS) $(launchctl_DEPENDENCIES) + @rm -f launchctl$(EXEEXT) + $(LINK) $(launchctl_LDFLAGS) $(launchctl_OBJECTS) $(launchctl_LDADD) $(LIBS) +launchd-launchd.$(OBJEXT): launchd.c +launchd-init.$(OBJEXT): init.c +launchd-bootstrap.$(OBJEXT): bootstrap.c +launchd-lists.$(OBJEXT): lists.c +launchd-rpc_services.$(OBJEXT): rpc_services.c +launchd-bootstrapServer.$(OBJEXT): bootstrapServer.c +launchd$(EXEEXT): $(launchd_OBJECTS) $(launchd_DEPENDENCIES) + @rm -f launchd$(EXEEXT) + $(LINK) $(launchd_LDFLAGS) $(launchd_OBJECTS) $(launchd_LDADD) $(LIBS) +launchd_debugd-launchdebugd.$(OBJEXT): launchdebugd.c +launchd_debugd$(EXEEXT): $(launchd_debugd_OBJECTS) $(launchd_debugd_DEPENDENCIES) + @rm -f launchd_debugd$(EXEEXT) + $(LINK) $(launchd_debugd_LDFLAGS) $(launchd_debugd_OBJECTS) $(launchd_debugd_LDADD) $(LIBS) +launchproxy$(EXEEXT): $(launchproxy_OBJECTS) $(launchproxy_DEPENDENCIES) + @rm -f launchproxy$(EXEEXT) + $(LINK) $(launchproxy_LDFLAGS) $(launchproxy_OBJECTS) $(launchproxy_LDADD) $(LIBS) +register_mach_bootstrap_servers$(EXEEXT): $(register_mach_bootstrap_servers_OBJECTS) $(register_mach_bootstrap_servers_DEPENDENCIES) + @rm -f register_mach_bootstrap_servers$(EXEEXT) + $(LINK) $(register_mach_bootstrap_servers_LDFLAGS) $(register_mach_bootstrap_servers_OBJECTS) $(register_mach_bootstrap_servers_LDADD) $(LIBS) +wait4path$(EXEEXT): $(wait4path_OBJECTS) $(wait4path_DEPENDENCIES) + @rm -f wait4path$(EXEEXT) + $(LINK) $(wait4path_LDFLAGS) $(wait4path_OBJECTS) $(wait4path_LDADD) $(LIBS) +sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT) +install-sbinSCRIPTS: $(sbin_SCRIPTS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(sbindir) + @list='$(sbin_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " $(sbinSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(sbindir)/$$f"; \ + $(sbinSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(sbindir)/$$f; \ + else :; fi; \ + done + +uninstall-sbinSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(sbin_SCRIPTS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \ + rm -f $(DESTDIR)$(sbindir)/$$f; \ + done + +mostlyclean-compile: + -rm -f *.$(OBJEXT) core *.core + +distclean-compile: + -rm -f *.tab.c + +.c.o: + source='$<' object='$@' libtool=no \ + $(CCDEPMODE) $(depcomp) \ + $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< + +.c.obj: + source='$<' object='$@' libtool=no \ + $(CCDEPMODE) $(depcomp) \ + $(COMPILE) -c `cygpath -w $<` + +liblaunch_profile_a-liblaunch.o: liblaunch.c + source='liblaunch.c' object='liblaunch_profile_a-liblaunch.o' libtool=no \ + $(CCDEPMODE) $(depcomp) \ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblaunch_profile_a_CFLAGS) $(CFLAGS) -c -o liblaunch_profile_a-liblaunch.o `test -f 'liblaunch.c' || echo '$(srcdir)/'`liblaunch.c + +liblaunch_profile_a-liblaunch.obj: liblaunch.c + source='liblaunch.c' object='liblaunch_profile_a-liblaunch.obj' libtool=no \ + $(CCDEPMODE) $(depcomp) \ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblaunch_profile_a_CFLAGS) $(CFLAGS) -c -o liblaunch_profile_a-liblaunch.obj `cygpath -w liblaunch.c` + +SystemStarter-StartupItems.o: StartupItems.c + source='StartupItems.c' object='SystemStarter-StartupItems.o' libtool=no \ + $(CCDEPMODE) $(depcomp) \ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(SystemStarter_CFLAGS) $(CFLAGS) -c -o SystemStarter-StartupItems.o `test -f 'StartupItems.c' || echo '$(srcdir)/'`StartupItems.c + +SystemStarter-StartupItems.obj: StartupItems.c + source='StartupItems.c' object='SystemStarter-StartupItems.obj' libtool=no \ + $(CCDEPMODE) $(depcomp) \ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(SystemStarter_CFLAGS) $(CFLAGS) -c -o SystemStarter-StartupItems.obj `cygpath -w StartupItems.c` + +SystemStarter-IPC.o: IPC.c + source='IPC.c' object='SystemStarter-IPC.o' libtool=no \ + $(CCDEPMODE) $(depcomp) \ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(SystemStarter_CFLAGS) $(CFLAGS) -c -o SystemStarter-IPC.o `test -f 'IPC.c' || echo '$(srcdir)/'`IPC.c + +SystemStarter-IPC.obj: IPC.c + source='IPC.c' object='SystemStarter-IPC.obj' libtool=no \ + $(CCDEPMODE) $(depcomp) \ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(SystemStarter_CFLAGS) $(CFLAGS) -c -o SystemStarter-IPC.obj `cygpath -w IPC.c` + +SystemStarter-SystemStarter.o: SystemStarter.c + source='SystemStarter.c' object='SystemStarter-SystemStarter.o' libtool=no \ + $(CCDEPMODE) $(depcomp) \ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(SystemStarter_CFLAGS) $(CFLAGS) -c -o SystemStarter-SystemStarter.o `test -f 'SystemStarter.c' || echo '$(srcdir)/'`SystemStarter.c + +SystemStarter-SystemStarter.obj: SystemStarter.c + source='SystemStarter.c' object='SystemStarter-SystemStarter.obj' libtool=no \ + $(CCDEPMODE) $(depcomp) \ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(SystemStarter_CFLAGS) $(CFLAGS) -c -o SystemStarter-SystemStarter.obj `cygpath -w SystemStarter.c` + +launchd-launchd.o: launchd.c + source='launchd.c' object='launchd-launchd.o' libtool=no \ + $(CCDEPMODE) $(depcomp) \ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-launchd.o `test -f 'launchd.c' || echo '$(srcdir)/'`launchd.c + +launchd-launchd.obj: launchd.c + source='launchd.c' object='launchd-launchd.obj' libtool=no \ + $(CCDEPMODE) $(depcomp) \ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-launchd.obj `cygpath -w launchd.c` + +launchd-init.o: init.c + source='init.c' object='launchd-init.o' libtool=no \ + $(CCDEPMODE) $(depcomp) \ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-init.o `test -f 'init.c' || echo '$(srcdir)/'`init.c + +launchd-init.obj: init.c + source='init.c' object='launchd-init.obj' libtool=no \ + $(CCDEPMODE) $(depcomp) \ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-init.obj `cygpath -w init.c` + +launchd-bootstrap.o: bootstrap.c + source='bootstrap.c' object='launchd-bootstrap.o' libtool=no \ + $(CCDEPMODE) $(depcomp) \ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-bootstrap.o `test -f 'bootstrap.c' || echo '$(srcdir)/'`bootstrap.c + +launchd-bootstrap.obj: bootstrap.c + source='bootstrap.c' object='launchd-bootstrap.obj' libtool=no \ + $(CCDEPMODE) $(depcomp) \ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-bootstrap.obj `cygpath -w bootstrap.c` + +launchd-lists.o: lists.c + source='lists.c' object='launchd-lists.o' libtool=no \ + $(CCDEPMODE) $(depcomp) \ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-lists.o `test -f 'lists.c' || echo '$(srcdir)/'`lists.c + +launchd-lists.obj: lists.c + source='lists.c' object='launchd-lists.obj' libtool=no \ + $(CCDEPMODE) $(depcomp) \ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-lists.obj `cygpath -w lists.c` + +launchd-rpc_services.o: rpc_services.c + source='rpc_services.c' object='launchd-rpc_services.o' libtool=no \ + $(CCDEPMODE) $(depcomp) \ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-rpc_services.o `test -f 'rpc_services.c' || echo '$(srcdir)/'`rpc_services.c + +launchd-rpc_services.obj: rpc_services.c + source='rpc_services.c' object='launchd-rpc_services.obj' libtool=no \ + $(CCDEPMODE) $(depcomp) \ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-rpc_services.obj `cygpath -w rpc_services.c` + +launchd-bootstrapServer.o: bootstrapServer.c + source='bootstrapServer.c' object='launchd-bootstrapServer.o' libtool=no \ + $(CCDEPMODE) $(depcomp) \ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-bootstrapServer.o `test -f 'bootstrapServer.c' || echo '$(srcdir)/'`bootstrapServer.c + +launchd-bootstrapServer.obj: bootstrapServer.c + source='bootstrapServer.c' object='launchd-bootstrapServer.obj' libtool=no \ + $(CCDEPMODE) $(depcomp) \ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-bootstrapServer.obj `cygpath -w bootstrapServer.c` + +launchd_debugd-launchdebugd.o: launchdebugd.c + source='launchdebugd.c' object='launchd_debugd-launchdebugd.o' libtool=no \ + $(CCDEPMODE) $(depcomp) \ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_debugd_CFLAGS) $(CFLAGS) -c -o launchd_debugd-launchdebugd.o `test -f 'launchdebugd.c' || echo '$(srcdir)/'`launchdebugd.c + +launchd_debugd-launchdebugd.obj: launchdebugd.c + source='launchdebugd.c' object='launchd_debugd-launchdebugd.obj' libtool=no \ + $(CCDEPMODE) $(depcomp) \ + $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_debugd_CFLAGS) $(CFLAGS) -c -o launchd_debugd-launchdebugd.obj `cygpath -w launchdebugd.c` +CCDEPMODE = depmode=gcc3 +uninstall-info-am: + +man1dir = $(mandir)/man1 +install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(man1dir) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ + done +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ + rm -f $(DESTDIR)$(man1dir)/$$inst; \ + done + +man5dir = $(mandir)/man5 +install-man5: $(man5_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(man5dir) + @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.5*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 5*) ;; \ + *) ext='5' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst; \ + done +uninstall-man5: + @$(NORMAL_UNINSTALL) + @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.5*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f $(DESTDIR)$(man5dir)/$$inst"; \ + rm -f $(DESTDIR)$(man5dir)/$$inst; \ + done + +man8dir = $(mandir)/man8 +install-man8: $(man8_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(man8dir) + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 8*) ;; \ + *) ext='8' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \ + done +uninstall-man8: + @$(NORMAL_UNINSTALL) + @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ + l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ + for i in $$l2; do \ + case "$$i" in \ + *.8*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \ + rm -f $(DESTDIR)$(man8dir)/$$inst; \ + done +sysconfDATA_INSTALL = $(INSTALL_DATA) +install-sysconfDATA: $(sysconf_DATA) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(sysconfdir) + @list='$(sysconf_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f"; \ + $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \ + done + +uninstall-sysconfDATA: + @$(NORMAL_UNINSTALL) + @list='$(sysconf_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(sysconfdir)/$$f"; \ + rm -f $(DESTDIR)$(sysconfdir)/$$f; \ + done + +ETAGS = etags +ETAGSFLAGS = + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique + +TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$tags$$unique" \ + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + +top_distdir = .. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + +distdir: $(DISTFILES) + @list='$(DISTFILES)'; for file in $$list; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \ + config.h + +installdirs: + $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(libexecdir) $(DESTDIR)$(sbindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) $(DESTDIR)$(man8dir) $(DESTDIR)$(sysconfdir) + +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am # install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \ + clean-noinstLIBRARIES clean-sbinPROGRAMS mostlyclean-am + +distclean: distclean-am + +distclean-am: clean-am distclean-compile distclean-depend \ + distclean-generic distclean-hdr distclean-tags + +dvi: dvi-am + +dvi-am: + +info: info-am + +info-am: + +install-data-am: install-man + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + +install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \ + install-sbinPROGRAMS install-sbinSCRIPTS install-sysconfDATA + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-exec-hook + +install-info: install-info-am + +install-man: install-man1 install-man5 install-man8 + +installcheck-am: + +maintainer-clean: maintainer-clean-am + +maintainer-clean-am: distclean-am maintainer-clean-generic -PROJECTVERSION = 2.8 -PROJECT_TYPE = Tool +mostlyclean: mostlyclean-am -HFILES = bootstrap_internal.h config.h launch.h launch_priv.h launchd.h lists.h +mostlyclean-am: mostlyclean-compile mostlyclean-generic -CFILES = launchd.c init.c bootstrap.c lists.c rpc_services.c +uninstall-am: uninstall-binPROGRAMS uninstall-info-am \ + uninstall-libexecPROGRAMS uninstall-man uninstall-sbinPROGRAMS \ + uninstall-sbinSCRIPTS uninstall-sysconfDATA -OTHERSRCS = Makefile.preamble Makefile bootstrap.defs launchd.8 \ - Makefile.postamble +uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 -MAKEFILEDIR = $(MAKEFILEPATH)/pb_makefiles -CODE_GEN_STYLE = DYNAMIC -MAKEFILE = tool.make -NEXTSTEP_INSTALLDIR = /sbin -OTHER_CFLAGS= $(DARWIN_HDRS) -DPID1_REAP_ADOPTED_CHILDREN -LIBS = $(LIBMAC) $(LIBBSM) -DEBUG_LIBS = $(LIBS) -PROF_LIBS = $(LIBS) +.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libexecPROGRAMS clean-noinstLIBRARIES \ + clean-sbinPROGRAMS distclean distclean-compile distclean-depend \ + distclean-generic distclean-hdr distclean-tags distdir dvi \ + dvi-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-libexecPROGRAMS \ + install-man install-man1 install-man5 install-man8 \ + install-sbinPROGRAMS install-sbinSCRIPTS install-strip \ + install-sysconfDATA installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic tags uninstall \ + uninstall-am uninstall-binPROGRAMS uninstall-info-am \ + uninstall-libexecPROGRAMS uninstall-man uninstall-man1 \ + uninstall-man5 uninstall-man8 uninstall-sbinPROGRAMS \ + uninstall-sbinSCRIPTS uninstall-sysconfDATA -NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc -WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc -PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc -NEXTSTEP_JAVA_COMPILER = /usr/bin/javac -WINDOWS_JAVA_COMPILER = $(JDKBINDIR)/javac.exe -PDO_UNIX_JAVA_COMPILER = $(NEXTDEV_BIN)/javac -include $(MAKEFILEDIR)/platform.make +bootstrap.c:: bootstrap.h --include Makefile.preamble +bootstrap.h bootstrapServer.c bootstrapUser.c: $(srcdir)/bootstrap.defs + $(MIG) $(MIGFLAGS) $(srcdir)/bootstrap.defs -include $(MAKEFILEDIR)/$(MAKEFILE) +$(addprefix $(DESTDIR)/System/Library/StartupItems/, $(STARTUPITEMS)): + mkdir -p $@ + cp $(srcdir)/StartupItems/$(notdir $@) $@ + chmod 755 $@/$(notdir $@) + cp $(srcdir)/StartupItems/$(notdir $@).plist $@/StartupParameters.plist --include Makefile.postamble +install-startupitems: $(addprefix $(DESTDIR)/System/Library/StartupItems/, $(STARTUPITEMS)) --include Makefile.dependencies +install-data-hook: install-startupitems + mkdir -p $(DESTDIR)/usr/local/lib/system + cp liblaunch.a $(DESTDIR)/usr/local/lib/system + cp liblaunch.a $(DESTDIR)/usr/local/lib/system/liblaunch_debug.a + cp liblaunch_profile.a $(DESTDIR)/usr/local/lib/system/liblaunch_profile.a + mkdir -p $(DESTDIR)/usr/include + cp $(srcdir)/launch.h $(DESTDIR)/usr/include + mkdir -p $(DESTDIR)/usr/local/include + cp $(srcdir)/launch_priv.h $(DESTDIR)/usr/local/include + mkdir -p $(DESTDIR)/$(sysconfdir)/mach_init.d + mkdir -p $(DESTDIR)/$(sysconfdir)/mach_init_per_user.d + mkdir -p $(DESTDIR)/Library/LaunchDaemons + mkdir -p $(DESTDIR)/Library/LaunchAgents + mkdir -p $(DESTDIR)/System/Library/LaunchDaemons + mkdir -p $(DESTDIR)/System/Library/LaunchAgents -include ../../build/Mig.mk +install-exec-hook: + chmod u+s $(DESTDIR)/$(sbindir)/launchd +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:38:41 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D3D016A404; Sun, 21 Jan 2007 22:38:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D9F9616A400 for ; Sun, 21 Jan 2007 22:38:40 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C78E913C47E for ; Sun, 21 Jan 2007 22:38:40 +0000 (UTC) (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 l0LMceDr064532 for ; Sun, 21 Jan 2007 22:38:40 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMce1F064529 for perforce@freebsd.org; Sun, 21 Jan 2007 22:38:40 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:38:40 GMT Message-Id: <200701212238.l0LMce1F064529@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 113291 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:38:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=113291 Change 113291 by millert@millert_macbook on 2007/01/21 22:38:38 Fix building on non-MAC system Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/Makefile#4 (text+ko) ==== @@ -71,7 +71,7 @@ am__include = include am__quote = install_sh = install -AM_CFLAGS = -no-cpp-precomp -F/System/Library/PrivateFrameworks -Wall -W -Wshadow -Wpadded -Werror -fconstant-cfstrings +AM_CFLAGS = -no-cpp-precomp -F/System/Library/PrivateFrameworks -Wall -W -Wshadow -Werror -fconstant-cfstrings sbin_SCRIPTS = service @@ -137,7 +137,7 @@ StartupItemContext$(EXEEXT) launchproxy$(EXEEXT) sbin_PROGRAMS = launchd$(EXEEXT) SystemStarter$(EXEEXT) \ launchd_debugd$(EXEEXT) -PROGRAMS = $(bin_PROGRAMS) # $(libexec_PROGRAMS) $(sbin_PROGRAMS) +PROGRAMS = $(sbin_PROGRAMS) # $(bin_PROGRAMS) $(libexec_PROGRAMS) ConsoleMessage_SOURCES = ConsoleMessage.c ConsoleMessage_OBJECTS = ConsoleMessage.$(OBJEXT) @@ -189,11 +189,10 @@ DEFS = -DHAVE_CONFIG_H -DEFAULT_INCLUDES = -I. -I$(srcdir) -I. +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(EXPORT_USR_INCLUDE) CPPFLAGS = LDFLAGS = LIBS = -depcomp = $(SHELL) $(top_srcdir)/depcomp COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) @@ -368,124 +367,99 @@ .c.o: source='$<' object='$@' libtool=no \ - $(CCDEPMODE) $(depcomp) \ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< .c.obj: source='$<' object='$@' libtool=no \ - $(CCDEPMODE) $(depcomp) \ $(COMPILE) -c `cygpath -w $<` liblaunch_profile_a-liblaunch.o: liblaunch.c source='liblaunch.c' object='liblaunch_profile_a-liblaunch.o' libtool=no \ - $(CCDEPMODE) $(depcomp) \ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblaunch_profile_a_CFLAGS) $(CFLAGS) -c -o liblaunch_profile_a-liblaunch.o `test -f 'liblaunch.c' || echo '$(srcdir)/'`liblaunch.c liblaunch_profile_a-liblaunch.obj: liblaunch.c source='liblaunch.c' object='liblaunch_profile_a-liblaunch.obj' libtool=no \ - $(CCDEPMODE) $(depcomp) \ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblaunch_profile_a_CFLAGS) $(CFLAGS) -c -o liblaunch_profile_a-liblaunch.obj `cygpath -w liblaunch.c` SystemStarter-StartupItems.o: StartupItems.c source='StartupItems.c' object='SystemStarter-StartupItems.o' libtool=no \ - $(CCDEPMODE) $(depcomp) \ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(SystemStarter_CFLAGS) $(CFLAGS) -c -o SystemStarter-StartupItems.o `test -f 'StartupItems.c' || echo '$(srcdir)/'`StartupItems.c SystemStarter-StartupItems.obj: StartupItems.c source='StartupItems.c' object='SystemStarter-StartupItems.obj' libtool=no \ - $(CCDEPMODE) $(depcomp) \ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(SystemStarter_CFLAGS) $(CFLAGS) -c -o SystemStarter-StartupItems.obj `cygpath -w StartupItems.c` SystemStarter-IPC.o: IPC.c source='IPC.c' object='SystemStarter-IPC.o' libtool=no \ - $(CCDEPMODE) $(depcomp) \ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(SystemStarter_CFLAGS) $(CFLAGS) -c -o SystemStarter-IPC.o `test -f 'IPC.c' || echo '$(srcdir)/'`IPC.c SystemStarter-IPC.obj: IPC.c source='IPC.c' object='SystemStarter-IPC.obj' libtool=no \ - $(CCDEPMODE) $(depcomp) \ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(SystemStarter_CFLAGS) $(CFLAGS) -c -o SystemStarter-IPC.obj `cygpath -w IPC.c` SystemStarter-SystemStarter.o: SystemStarter.c source='SystemStarter.c' object='SystemStarter-SystemStarter.o' libtool=no \ - $(CCDEPMODE) $(depcomp) \ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(SystemStarter_CFLAGS) $(CFLAGS) -c -o SystemStarter-SystemStarter.o `test -f 'SystemStarter.c' || echo '$(srcdir)/'`SystemStarter.c SystemStarter-SystemStarter.obj: SystemStarter.c source='SystemStarter.c' object='SystemStarter-SystemStarter.obj' libtool=no \ - $(CCDEPMODE) $(depcomp) \ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(SystemStarter_CFLAGS) $(CFLAGS) -c -o SystemStarter-SystemStarter.obj `cygpath -w SystemStarter.c` launchd-launchd.o: launchd.c source='launchd.c' object='launchd-launchd.o' libtool=no \ - $(CCDEPMODE) $(depcomp) \ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-launchd.o `test -f 'launchd.c' || echo '$(srcdir)/'`launchd.c launchd-launchd.obj: launchd.c source='launchd.c' object='launchd-launchd.obj' libtool=no \ - $(CCDEPMODE) $(depcomp) \ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-launchd.obj `cygpath -w launchd.c` launchd-init.o: init.c source='init.c' object='launchd-init.o' libtool=no \ - $(CCDEPMODE) $(depcomp) \ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-init.o `test -f 'init.c' || echo '$(srcdir)/'`init.c launchd-init.obj: init.c source='init.c' object='launchd-init.obj' libtool=no \ - $(CCDEPMODE) $(depcomp) \ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-init.obj `cygpath -w init.c` launchd-bootstrap.o: bootstrap.c source='bootstrap.c' object='launchd-bootstrap.o' libtool=no \ - $(CCDEPMODE) $(depcomp) \ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-bootstrap.o `test -f 'bootstrap.c' || echo '$(srcdir)/'`bootstrap.c launchd-bootstrap.obj: bootstrap.c source='bootstrap.c' object='launchd-bootstrap.obj' libtool=no \ - $(CCDEPMODE) $(depcomp) \ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-bootstrap.obj `cygpath -w bootstrap.c` launchd-lists.o: lists.c source='lists.c' object='launchd-lists.o' libtool=no \ - $(CCDEPMODE) $(depcomp) \ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-lists.o `test -f 'lists.c' || echo '$(srcdir)/'`lists.c launchd-lists.obj: lists.c source='lists.c' object='launchd-lists.obj' libtool=no \ - $(CCDEPMODE) $(depcomp) \ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-lists.obj `cygpath -w lists.c` launchd-rpc_services.o: rpc_services.c source='rpc_services.c' object='launchd-rpc_services.o' libtool=no \ - $(CCDEPMODE) $(depcomp) \ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-rpc_services.o `test -f 'rpc_services.c' || echo '$(srcdir)/'`rpc_services.c launchd-rpc_services.obj: rpc_services.c source='rpc_services.c' object='launchd-rpc_services.obj' libtool=no \ - $(CCDEPMODE) $(depcomp) \ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-rpc_services.obj `cygpath -w rpc_services.c` launchd-bootstrapServer.o: bootstrapServer.c source='bootstrapServer.c' object='launchd-bootstrapServer.o' libtool=no \ - $(CCDEPMODE) $(depcomp) \ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-bootstrapServer.o `test -f 'bootstrapServer.c' || echo '$(srcdir)/'`bootstrapServer.c launchd-bootstrapServer.obj: bootstrapServer.c source='bootstrapServer.c' object='launchd-bootstrapServer.obj' libtool=no \ - $(CCDEPMODE) $(depcomp) \ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-bootstrapServer.obj `cygpath -w bootstrapServer.c` launchd_debugd-launchdebugd.o: launchdebugd.c source='launchdebugd.c' object='launchd_debugd-launchdebugd.o' libtool=no \ - $(CCDEPMODE) $(depcomp) \ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_debugd_CFLAGS) $(CFLAGS) -c -o launchd_debugd-launchdebugd.o `test -f 'launchdebugd.c' || echo '$(srcdir)/'`launchdebugd.c launchd_debugd-launchdebugd.obj: launchdebugd.c source='launchdebugd.c' object='launchd_debugd-launchdebugd.obj' libtool=no \ - $(CCDEPMODE) $(depcomp) \ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_debugd_CFLAGS) $(CFLAGS) -c -o launchd_debugd-launchdebugd.obj `cygpath -w launchdebugd.c` -CCDEPMODE = depmode=gcc3 uninstall-info-am: man1dir = $(mandir)/man1 From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:41:46 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96F9516A407; Sun, 21 Jan 2007 22:41:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6992716A404 for ; Sun, 21 Jan 2007 22:41:46 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5670113C441 for ; Sun, 21 Jan 2007 22:41:46 +0000 (UTC) (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 l0LMfkOn065392 for ; Sun, 21 Jan 2007 22:41:46 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMfkeI065388 for perforce@freebsd.org; Sun, 21 Jan 2007 22:41:46 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:41:46 GMT Message-Id: <200701212241.l0LMfkeI065388@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 113292 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:41:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=113292 Change 113292 by millert@millert_macbook on 2007/01/21 22:41:24 Correctly update the launchd package to launchd-106.14 which corresponds to Darwin 8.8 (Mac OS X 10.4.8). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/AUTHORS#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/COPYING#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/ChangeLog#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/INSTALL#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/Makefile.am#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/Makefile.in#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/NEWS#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/README#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/TODO#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/aclocal.m4#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/compile#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/configure#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/configure.ac#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/depcomp#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/doc/HOWTO.html#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/doc/Makefile.am#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/doc/Makefile.in#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/doc/StartupItem-NOTES.rtf#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/doc/com.apple.launchdebugd.xml#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/doc/sampled.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/install-sh#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/missing#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/mkinstalldirs#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/ConsoleMessage.8#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/ConsoleMessage.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/IPC.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/IPC.h#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/Makefile.am#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/Makefile.in#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/StartupItemContext.8#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/StartupItemContext.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/StartupItems.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/StartupItems.h#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/StartupItems/Apache#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/StartupItems/Apache.plist#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/StartupItems/AppServices#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/StartupItems/AppServices.plist#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/StartupItems/AppleShare#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/StartupItems/AppleShare.plist#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/StartupItems/AuthServer#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/StartupItems/AuthServer.plist#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/StartupItems/Disks#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/StartupItems/Disks.plist#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/StartupItems/IPServices#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/StartupItems/IPServices.plist#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/StartupItems/NFS#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/StartupItems/NFS.plist#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/StartupItems/NIS#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/StartupItems/NIS.plist#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/StartupItems/NetworkTime#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/StartupItems/NetworkTime.plist#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/SystemStarter.8#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/SystemStarter.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/SystemStarter.h#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/SystemStarterIPC.h#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/bootstrap.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/bootstrap.defs#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/bootstrap_internal.h#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/config.h.in#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/hostconfig#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/init.8#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/init.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/launch.h#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/launch_priv.h#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/launchctl.1#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/launchctl.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/launchd.8#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/launchd.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/launchd.conf.5#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/launchd.h#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/launchd.plist.5#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/launchd_debugd.8#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/launchdebugd.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/launchproxy.8#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/launchproxy.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/liblaunch.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/lists.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/lists.h#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/rc#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/rc.8#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/rc.common#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/rc.netboot#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/rc.shutdown#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/register_mach_bootstrap_servers.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/rpc_services.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/service#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/service.8#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/wait4path.1#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/src/wait4path.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/testing/StartCalendarInterval.plist#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/testing/StartInterval.plist#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/testing/badexec.plist#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/testing/badexit.plist#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/testing/missed-EVFILT_WRITE.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/testing/missing_req_keys.plist#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/testing/secsock.plist#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/launchd/testing/signaldeath.plist#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/Makefile#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/SystemStarter.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/bootstrap.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/launch_priv.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/launchctl.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/launchd.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/Makefile#5 (text+ko) ==== @@ -71,7 +71,7 @@ am__include = include am__quote = install_sh = install -AM_CFLAGS = -no-cpp-precomp -F/System/Library/PrivateFrameworks -Wall -W -Wshadow -Werror -fconstant-cfstrings +AM_CFLAGS = -no-cpp-precomp -F/System/Library/PrivateFrameworks -Wall -W -Wshadow -fconstant-cfstrings sbin_SCRIPTS = service @@ -189,7 +189,7 @@ DEFS = -DHAVE_CONFIG_H -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(EXPORT_USR_INCLUDE) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(DARWIN_HDRS) CPPFLAGS = LDFLAGS = LIBS = ==== //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/SystemStarter.c#2 (text+ko) ==== @@ -169,7 +169,7 @@ CFIndex aCount = CFDictionaryGetCount(aStartupContext->aStatusDict); if (!aWaitingForString) { - aWaitingForString = CFSTR("Waiting for %@"); + aWaitingForString = CFSTR("Waiting for %@ pid %d"); } if (aLastStatusDictionaryCount == aCount) { CFArrayRef aRunningList = StartupItemListGetRunning(aStartupContext->aWaitingList); @@ -177,7 +177,7 @@ CFMutableDictionaryRef anItem = (CFMutableDictionaryRef) CFArrayGetValueAtIndex(aRunningList, 0); CFStringRef anItemDescription = StartupItemGetDescription(anItem); CFStringRef aString = aWaitingForString && anItemDescription ? - CFStringCreateWithFormat(NULL, NULL, aWaitingForString, anItemDescription) : NULL; + CFStringCreateWithFormat(NULL, NULL, aWaitingForString, anItemDescription, StartupItemGetPID(anItem)) : NULL; if (aString) { CF_syslog(LOG_INFO, CFSTR("%@"), aString); ==== //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/bootstrap.c#2 (text+ko) ==== @@ -1046,3 +1046,16 @@ } return ((p_type & MACH_PORT_TYPE_PORT_RIGHTS) != 0); } + +/* Sigh... Libc's panic() call fails to abort and continues afterwards */ +void +panic(const char *msg, ...) +{ + va_list ap; + + va_start(ap, msg); + vfprintf(stderr, msg, ap); + va_end(ap); + + _exit(EXIT_FAILURE); +} ==== //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/launch_priv.h#2 (text+ko) ==== @@ -39,6 +39,8 @@ #define LAUNCH_KEY_GETRUSAGESELF "GetResourceUsageSelf" #define LAUNCH_KEY_GETRUSAGECHILDREN "GetResourceUsageChildren" +#define LAUNCH_KEY_WORKAROUNDBONJOUR "WorkaroundBonjour" + #define LAUNCHD_SOCKET_ENV "LAUNCHD_SOCKET" #define LAUNCHD_SOCK_PREFIX "/var/launchd" #define LAUNCHD_TRUSTED_FD_ENV "__LAUNCHD_FD" ==== //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/launchctl.c#2 (text+ko) ==== @@ -68,19 +68,18 @@ static launch_data_t read_plist_file(const char *file, bool editondisk, bool load); static CFPropertyListRef CreateMyPropertyListFromFile(const char *); static void WriteMyPropertyListToFile(CFPropertyListRef, const char *); -static void readpath(const char *, launch_data_t, launch_data_t, launch_data_t, bool editondisk, bool load, bool forceload); -static void readfile(const char *, launch_data_t, launch_data_t, launch_data_t, bool editondisk, bool load, bool forceload); +static void readpath(const char *, launch_data_t, launch_data_t, bool editondisk, bool load, bool forceload); +static void readfile(const char *, launch_data_t, launch_data_t, bool editondisk, bool load, bool forceload); static int _fd(int); static int demux_cmd(int argc, char *const argv[]); -static launch_data_t do_rendezvous_magic(const struct addrinfo *res, const char *serv); +static void do_rendezvous_magic(const struct addrinfo *res, const char *serv, const char *label); +static void workaround_bonjour_asynchronously(void); static void submit_job_pass(launch_data_t jobs); static void submit_mach_jobs(launch_data_t jobs); static void let_go_of_mach_jobs(void); static void do_mgroup_join(int fd, int family, int socktype, int protocol, const char *mgroup); static void print_jobs(launch_data_t j, const char *label, void *context); static bool is_legacy_mach_job(launch_data_t obj); -static bool delay_to_second_pass(launch_data_t o); -static void delay_to_second_pass2(launch_data_t o, const char *key, void *context); static int load_and_unload_cmd(int argc, char *const argv[]); //static int reload_cmd(int argc, char *const argv[]); @@ -341,46 +340,7 @@ } void -delay_to_second_pass2(launch_data_t o, const char *key, void *context) -{ - bool *res = context; - size_t i; - - if (key && 0 == strcmp(key, LAUNCH_JOBSOCKETKEY_BONJOUR)) { - *res = true; - return; - } - - switch (launch_data_get_type(o)) { - case LAUNCH_DATA_DICTIONARY: - launch_data_dict_iterate(o, delay_to_second_pass2, context); - break; - case LAUNCH_DATA_ARRAY: - for (i = 0; i < launch_data_array_get_count(o); i++) - delay_to_second_pass2(launch_data_array_get_index(o, i), NULL, context); - break; - default: - break; - } -} - -bool -delay_to_second_pass(launch_data_t o) -{ - bool res = false; - - launch_data_t socks = launch_data_dict_lookup(o, LAUNCH_JOBKEY_SOCKETS); - - if (NULL == socks) - return false; - - delay_to_second_pass2(socks, NULL, &res); - - return res; -} - -void -readfile(const char *what, launch_data_t pass0, launch_data_t pass1, launch_data_t pass2, bool editondisk, bool load, bool forceload) +readfile(const char *what, launch_data_t pass0, launch_data_t pass1, bool editondisk, bool load, bool forceload) { launch_data_t tmpd, thejob; bool job_disabled = false; @@ -412,14 +372,11 @@ return; } - if (delay_to_second_pass(thejob)) - launch_data_array_append(pass2, thejob); - else - launch_data_array_append(pass1, thejob); + launch_data_array_append(pass1, thejob); } void -readpath(const char *what, launch_data_t pass0, launch_data_t pass1, launch_data_t pass2, bool editondisk, bool load, bool forceload) +readpath(const char *what, launch_data_t pass0, launch_data_t pass1, bool editondisk, bool load, bool forceload) { char buf[MAXPATHLEN]; struct stat sb; @@ -430,7 +387,7 @@ return; if (S_ISREG(sb.st_mode) && !(sb.st_mode & S_IWOTH)) { - readfile(what, pass0, pass1, pass2, editondisk, load, forceload); + readfile(what, pass0, pass1, editondisk, load, forceload); } else { if ((d = opendir(what)) == NULL) { fprintf(stderr, "%s: opendir() failed to open the directory\n", getprogname()); @@ -442,7 +399,7 @@ continue; snprintf(buf, sizeof(buf), "%s/%s", what, de->d_name); - readfile(buf, pass0, pass1, pass2, editondisk, load, forceload); + readfile(buf, pass0, pass1, editondisk, load, forceload); } closedir(d); } @@ -498,9 +455,13 @@ static void sock_dict_edit_entry(launch_data_t tmp, const char *key, launch_data_t fdarray, launch_data_t thejob) { launch_data_t a, val; + const char *joblabel; int sfd, st = SOCK_STREAM; bool passive = true; + assert((val = launch_data_dict_lookup(thejob, LAUNCH_JOBKEY_LABEL)) != NULL); + joblabel = launch_data_get_string(val); + if ((val = launch_data_dict_lookup(tmp, LAUNCH_JOBSOCKETKEY_TYPE))) { if (!strcasecmp(launch_data_get_string(val), "stream")) { st = SOCK_STREAM; @@ -630,7 +591,6 @@ } for (res = res0; res; res = res->ai_next) { - launch_data_t rvs_fd = NULL; if ((sfd = _fd(socket(res->ai_family, res->ai_socktype, res->ai_protocol))) == -1) { fprintf(stderr, "socket(): %s\n", strerror(errno)); return; @@ -667,30 +627,22 @@ } if (rendezvous && (res->ai_family == AF_INET || res->ai_family == AF_INET6) && (res->ai_socktype == SOCK_STREAM || res->ai_socktype == SOCK_DGRAM)) { - launch_data_t rvs_fds = launch_data_dict_lookup(thejob, LAUNCH_JOBKEY_BONJOURFDS); - if (NULL == rvs_fds) { - rvs_fds = launch_data_alloc(LAUNCH_DATA_ARRAY); - launch_data_dict_insert(thejob, rvs_fds, LAUNCH_JOBKEY_BONJOURFDS); - } if (NULL == rnames) { - rvs_fd = do_rendezvous_magic(res, serv); - if (rvs_fd) - launch_data_array_append(rvs_fds, rvs_fd); + do_rendezvous_magic(res, serv, joblabel); } else if (LAUNCH_DATA_STRING == launch_data_get_type(rnames)) { - rvs_fd = do_rendezvous_magic(res, launch_data_get_string(rnames)); - if (rvs_fd) - launch_data_array_append(rvs_fds, rvs_fd); + do_rendezvous_magic(res, launch_data_get_string(rnames), joblabel); } else if (LAUNCH_DATA_ARRAY == launch_data_get_type(rnames)) { size_t rn_i, rn_ac = launch_data_array_get_count(rnames); for (rn_i = 0; rn_i < rn_ac; rn_i++) { launch_data_t rn_tmp = launch_data_array_get_index(rnames, rn_i); - rvs_fd = do_rendezvous_magic(res, launch_data_get_string(rn_tmp)); - if (rvs_fd) - launch_data_array_append(rvs_fds, rvs_fd); + do_rendezvous_magic(res, launch_data_get_string(rn_tmp), joblabel); } } + /* Launchd should not register the same service more than once */ + /* Switch to DNSServiceRegisterAddrInfo() */ + rendezvous = false; } } else { if (connect(sfd, res->ai_addr, res->ai_addrlen) == -1) { @@ -699,11 +651,6 @@ } } val = launch_data_new_fd(sfd); - if (rvs_fd) { - /* Launchd should not register the same service more than once */ - /* Switch to DNSServiceRegisterAddrInfo() */ - rendezvous = false; - } launch_data_array_append(fdarray, val); } } @@ -754,36 +701,87 @@ freeaddrinfo(res0); } +struct bonjour_magic { + SLIST_ENTRY(bonjour_magic) sle; + char *str; + int port; + char label[0]; +}; + +static SLIST_HEAD(, bonjour_magic) bm_later = { NULL }; + +void +do_rendezvous_magic(const struct addrinfo *res, const char *serv, const char *joblabel) +{ + struct bonjour_magic *bm = calloc(1, sizeof(struct bonjour_magic) + strlen(joblabel) + 1); + const char *typestr = "udp"; + + if (res->ai_socktype == SOCK_STREAM) + typestr = "tcp"; + + strcpy(bm->label, joblabel); + + asprintf(&bm->str, "_%s._%s.", serv, typestr); + + if (res->ai_family == AF_INET) { + bm->port = ((struct sockaddr_in *)res->ai_addr)->sin_port; + } else { + bm->port = ((struct sockaddr_in6 *)res->ai_addr)->sin6_port; + } + + SLIST_INSERT_HEAD(&bm_later, bm, sle); +} + -static launch_data_t do_rendezvous_magic(const struct addrinfo *res, const char *serv) +void +workaround_bonjour_asynchronously(void) { - struct stat sb; + launch_data_t resp, msg, msgpayload, tmpa; + struct bonjour_magic *bm; + DNSServiceErrorType error; DNSServiceRef service; - DNSServiceErrorType error; - char rvs_buf[200]; - short port; - static int statres = 1; + int fd; + + if (fork() != 0) + return; + + signal(SIGHUP, SIG_IGN); + setsid(); + sleep(30); + + msg = launch_data_alloc(LAUNCH_DATA_DICTIONARY); + msgpayload = launch_data_alloc(LAUNCH_DATA_DICTIONARY); - if (1 == statres) - statres = stat("/usr/sbin/mDNSResponder", &sb); + SLIST_FOREACH(bm, &bm_later, sle) { + service = NULL; + error = DNSServiceRegister(&service, 0, 0, NULL, bm->str, NULL, NULL, bm->port, 0, NULL, NULL, NULL); + if (error != kDNSServiceErr_NoError) { + fprintf(stderr, "DNSServiceRegister(\"%s\"): %d\n", bm->str, error); + continue; + } + fd = DNSServiceRefSockFD(service); + tmpa = launch_data_dict_lookup(msgpayload, bm->label); + if (!tmpa) { + tmpa = launch_data_alloc(LAUNCH_DATA_ARRAY); + launch_data_dict_insert(msgpayload, tmpa, bm->label); + } + launch_data_array_append(tmpa, launch_data_new_fd(fd)); + } - if (-1 == statres) - return NULL; + launch_data_dict_insert(msg, msgpayload, LAUNCH_KEY_WORKAROUNDBONJOUR); - sprintf(rvs_buf, "_%s._%s.", serv, res->ai_socktype == SOCK_STREAM ? "tcp" : "udp"); + resp = launch_msg(msg); - if (res->ai_family == AF_INET) - port = ((struct sockaddr_in *)res->ai_addr)->sin_port; - else - port = ((struct sockaddr_in6 *)res->ai_addr)->sin6_port; + launch_data_free(msg); - error = DNSServiceRegister(&service, 0, 0, NULL, rvs_buf, NULL, NULL, port, 0, NULL, NULL, NULL); + if (launch_data_get_type(resp) == LAUNCH_DATA_ERRNO) { + errno = launch_data_get_errno(resp); + fprintf(stderr, "Workaround Bonjour: %s\n", strerror(errno)); + } - if (error == kDNSServiceErr_NoError) - return launch_data_new_fd(DNSServiceRefSockFD(service)); + launch_data_free(resp); - fprintf(stderr, "DNSServiceRegister(\"%s\"): %d\n", serv, error); - return NULL; + _exit(EXIT_SUCCESS); } static CFPropertyListRef CreateMyPropertyListFromFile(const char *posixfile) @@ -928,7 +926,7 @@ static int load_and_unload_cmd(int argc, char *const argv[]) { - launch_data_t pass0, pass1, pass2; + launch_data_t pass0, pass1; int i, ch; bool wflag = false; bool lflag = false; @@ -954,7 +952,7 @@ return 1; } - /* I wish I didn't need to do three passes, but I need to load mDNSResponder and use it too. + /* I wish I didn't need to do multiple passes, but I need to load mDNSResponder and use it too. * And loading legacy mach init jobs is extra fun. * * In later versions of launchd, I hope to load everything in the first pass, @@ -965,33 +963,27 @@ pass0 = launch_data_alloc(LAUNCH_DATA_ARRAY); pass1 = launch_data_alloc(LAUNCH_DATA_ARRAY); - pass2 = launch_data_alloc(LAUNCH_DATA_ARRAY); for (i = 0; i < argc; i++) - readpath(argv[i], pass0, pass1, pass2, wflag, lflag, Fflag); + readpath(argv[i], pass0, pass1, wflag, lflag, Fflag); if (launch_data_array_get_count(pass0) == 0 && - launch_data_array_get_count(pass1) == 0 && - launch_data_array_get_count(pass2) == 0) { + launch_data_array_get_count(pass1) == 0) { fprintf(stderr, "nothing found to %s\n", lflag ? "load" : "unload"); launch_data_free(pass0); launch_data_free(pass1); - launch_data_free(pass2); return 1; } if (lflag) { distill_jobs(pass1); submit_mach_jobs(pass0); + workaround_bonjour_asynchronously(); submit_job_pass(pass1); let_go_of_mach_jobs(); - distill_jobs(pass2); - submit_job_pass(pass2); } else { for (i = 0; i < (int)launch_data_array_get_count(pass1); i++) unloadjob(launch_data_array_get_index(pass1, i)); - for (i = 0; i < (int)launch_data_array_get_count(pass2); i++) - unloadjob(launch_data_array_get_index(pass2, i)); } return 0; ==== //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/launchd.c#2 (text+ko) ==== @@ -143,6 +143,7 @@ static void job_callback(void *obj, struct kevent *kev); static void job_log(struct jobcb *j, int pri, const char *msg, ...) __attribute__((format(printf, 3, 4))); static void job_log_error(struct jobcb *j, int pri, const char *msg, ...) __attribute__((format(printf, 3, 4))); +static void job_prep_log_msg(struct jobcb *j, char *buf, const char *msg, int err); static void ipc_open(int fd, struct jobcb *j); static void ipc_close(struct conncb *c); @@ -323,7 +324,7 @@ static void pid1_magic_init(bool sflag, bool vflag, bool xflag) { pthread_attr_t attr; - int memmib[2] = { CTL_HW, HW_PHYSMEM }; + int memmib[2] = { CTL_HW, HW_MEMSIZE }; int mvnmib[2] = { CTL_KERN, KERN_MAXVNODES }; int hnmib[2] = { CTL_KERN, KERN_HOSTNAME }; #ifdef KERN_TFP @@ -913,6 +914,22 @@ launch_data_free(rmc.resp); } +static void +attach_bonjourfds_to_job(launch_data_t o, const char *key, void *context __attribute__((unused))) +{ + struct jobcb *j = NULL; + + TAILQ_FOREACH(j, &jobs, tqe) { + if (strcmp(j->label, key) == 0) + break; + } + + if (j == NULL) + return; + + launch_data_dict_insert(j->ldj, launch_data_copy(o), LAUNCH_JOBKEY_BONJOURFDS); + launch_data_revoke_fds(o); +} static void ipc_readmsg2(launch_data_t data, const char *cmd, void *context) { @@ -963,6 +980,9 @@ } else { resp = load_job(data); } + } else if (!strcmp(cmd, LAUNCH_KEY_WORKAROUNDBONJOUR)) { + launch_data_dict_iterate(data, attach_bonjourfds_to_job, NULL); + resp = launch_data_new_errno(0); } else if (!strcmp(cmd, LAUNCH_KEY_UNSETUSERENVIRONMENT)) { unsetenv(launch_data_get_string(data)); resp = launch_data_new_errno(0); @@ -2311,13 +2331,39 @@ } } -static void job_log_error(struct jobcb *j, int pri, const char *msg, ...) +void +job_prep_log_msg(struct jobcb *j, char *buf, const char *msg, int err) +{ + size_t lsz = strlen(j->label); + size_t i, o; + + for (i = 0, o = 0; i < lsz; i++, o++) { + if (j->label[i] == '%') { + buf[o] = '%'; + o++; + buf[o] = '%'; + } else { + buf[o] = j->label[i]; + } + } + + buf[o++] = ':'; + buf[o++] = ' '; + + if (err) { + sprintf(buf + o, "%s: %s", msg, strerror(err)); + } else { + strcpy(buf + o, msg); + } +} + +void +job_log_error(struct jobcb *j, int pri, const char *msg, ...) { - size_t newmsg_sz = strlen(msg) + strlen(j->label) + 200; - char *newmsg = alloca(newmsg_sz); + char newmsg[10000]; va_list ap; - sprintf(newmsg, "%s: %s: %s", j->label, msg, strerror(errno)); + job_prep_log_msg(j, newmsg, msg, errno); va_start(ap, msg); @@ -2326,13 +2372,13 @@ va_end(ap); } -static void job_log(struct jobcb *j, int pri, const char *msg, ...) +void +job_log(struct jobcb *j, int pri, const char *msg, ...) { - size_t newmsg_sz = strlen(msg) + sizeof(": ") + strlen(j->label); - char *newmsg = alloca(newmsg_sz); + char newmsg[10000]; va_list ap; - sprintf(newmsg, "%s: %s", j->label, msg); + job_prep_log_msg(j, newmsg, msg, 0); va_start(ap, msg); From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:42:48 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4ED2016A403; Sun, 21 Jan 2007 22:42:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2D32A16A400 for ; Sun, 21 Jan 2007 22:42:48 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1C08C13C457 for ; Sun, 21 Jan 2007 22:42:48 +0000 (UTC) (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 l0LMgm78065746 for ; Sun, 21 Jan 2007 22:42:48 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMgl8K065742 for perforce@freebsd.org; Sun, 21 Jan 2007 22:42:47 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:42:47 GMT Message-Id: <200701212242.l0LMgl8K065742@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 113293 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:42:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=113293 Change 113293 by millert@millert_macbook on 2007/01/21 22:42:25 Fix what looks like a mis-merge. Move MAC check before return. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_prot.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_prot.c#8 (text+ko) ==== @@ -1013,6 +1013,10 @@ audit_token.val[6] = p->p_ucred->cr_au.ai_asid; audit_token.val[7] = p->p_ucred->cr_au.ai_termid.port; +#ifdef MAC + mac_task_label_update_cred(p->p_ucred, p->task); +#endif + return (host_security_set_task_token(host_security_self(), p->task, sec_token, @@ -1020,9 +1024,6 @@ (sec_token.val[0]) ? HOST_PRIV_NULL : host_priv_self()) != KERN_SUCCESS); -#ifdef MAC - mac_task_label_update_cred(p->p_ucred, p->task); -#endif } From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:43:50 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC3C216A40E; Sun, 21 Jan 2007 22:43:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 562AF16A401 for ; Sun, 21 Jan 2007 22:43:50 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 454E113C44B for ; Sun, 21 Jan 2007 22:43:50 +0000 (UTC) (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 l0LMhomt066346 for ; Sun, 21 Jan 2007 22:43:50 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMhocE066333 for perforce@freebsd.org; Sun, 21 Jan 2007 22:43:50 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:43:50 GMT Message-Id: <200701212243.l0LMhocE066333@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 113294 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:43:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=113294 Change 113294 by millert@millert_macbook on 2007/01/21 22:43:44 Use stashed copy of ucred instead of needlessly calling vfs_context_ucred(). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_cache.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_cache.c#5 (text+ko) ==== @@ -670,7 +670,7 @@ * be perfomed in lookup(). */ if (!(cnp->cn_flags & DONOTAUTH)) { - error = mac_vnode_check_lookup(vfs_context_ucred(context), dp, cnp); + error = mac_vnode_check_lookup(ucred, dp, cnp); if (error) { name_cache_unlock(); return (error); From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:44:52 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BC3A16A408; Sun, 21 Jan 2007 22:44:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 384E716A406 for ; Sun, 21 Jan 2007 22:44:52 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 26DC813C459 for ; Sun, 21 Jan 2007 22:44:52 +0000 (UTC) (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 l0LMiqx8066582 for ; Sun, 21 Jan 2007 22:44:52 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMip7M066579 for perforce@freebsd.org; Sun, 21 Jan 2007 22:44:51 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:44:51 GMT Message-Id: <200701212244.l0LMip7M066579@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 113295 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:44:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=113295 Change 113295 by millert@millert_macbook on 2007/01/21 22:44:10 Fix some entrypoint names. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#53 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#53 (text+ko) ==== @@ -639,7 +639,7 @@ } static void -sebsd_init_ipc_label(struct label *label) +sebsd_ipc_label_init(struct label *label) { struct ipc_security_struct *new; @@ -650,7 +650,7 @@ } static void -sebsd_destroy_ipc_label(struct label *label) +sebsd_ipc_label_destroy(struct label *label) { mac_zfree(ipc_security_zone, SLOT(label)); @@ -678,7 +678,7 @@ } static void -sebsd_cleanup_sysv_label(struct label *label) +sebsd_sysv_label_recycle(struct label *label) { struct ipc_security_struct *ipcsec; @@ -3602,8 +3602,8 @@ .mpo_posixsem_check_unlink = sebsd_posixsem_check_unlink, .mpo_posixsem_check_wait = sebsd_posixsem_check_wait, .mpo_posixsem_label_associate = sebsd_posixsem_label_associate, - .mpo_posixsem_label_destroy = sebsd_destroy_ipc_label, - .mpo_posixsem_label_init = sebsd_init_ipc_label, + .mpo_posixsem_label_destroy = sebsd_ipc_label_destroy, + .mpo_posixsem_label_init = sebsd_ipc_label_init, .mpo_posixshm_check_create = sebsd_posixshm_check_create, .mpo_posixshm_check_mmap = sebsd_posixshm_check_mmap, .mpo_posixshm_check_open = sebsd_posixshm_check_open, @@ -3611,8 +3611,8 @@ .mpo_posixshm_check_truncate = sebsd_posixshm_check_truncate, .mpo_posixshm_check_unlink = sebsd_posixshm_check_unlink, .mpo_posixshm_label_associate = sebsd_posixshm_label_associate, - .mpo_posixshm_label_destroy = sebsd_destroy_ipc_label, - .mpo_posixshm_label_init = sebsd_init_ipc_label, + .mpo_posixshm_label_destroy = sebsd_ipc_label_destroy, + .mpo_posixshm_label_init = sebsd_ipc_label_init, .mpo_proc_check_debug = sebsd_proc_check_debug, .mpo_proc_check_getaudit = sebsd_proc_check_getaudit, .mpo_proc_check_mprotect = sebsd_proc_check_mprotect, @@ -3653,9 +3653,9 @@ .mpo_system_check_swapoff = sebsd_system_check_swapon, .mpo_system_check_swapon = sebsd_system_check_swapon, .mpo_sysvmsg_label_associate = sebsd_sysvmsg_label_associate, - .mpo_sysvmsg_label_destroy = sebsd_destroy_ipc_label, - .mpo_sysvmsg_label_init = sebsd_init_ipc_label, - .mpo_sysvmsg_label_recycle = sebsd_cleanup_sysv_label, + .mpo_sysvmsg_label_destroy = sebsd_ipc_label_destroy, + .mpo_sysvmsg_label_init = sebsd_ipc_label_init, + .mpo_sysvmsg_label_recycle = sebsd_sysv_label_recycle, .mpo_sysvmsq_check_enqueue = sebsd_sysvmsq_check_enqueue, .mpo_sysvmsq_check_msgrcv = sebsd_sysvmsq_check_msgrcv, .mpo_sysvmsq_check_msqctl = sebsd_sysvmsq_check_msqctl, @@ -3663,23 +3663,23 @@ .mpo_sysvmsq_check_msqrcv = sebsd_sysvmsq_check_msqrcv, .mpo_sysvmsq_check_msqsnd = sebsd_sysvmsq_check_msqsnd, .mpo_sysvmsq_label_associate = sebsd_sysvmsq_label_associate, - .mpo_sysvmsq_label_destroy = sebsd_destroy_ipc_label, - .mpo_sysvmsq_label_init = sebsd_init_ipc_label, - .mpo_sysvmsq_label_recycle = sebsd_cleanup_sysv_label, + .mpo_sysvmsq_label_destroy = sebsd_ipc_label_destroy, + .mpo_sysvmsq_label_init = sebsd_ipc_label_init, + .mpo_sysvmsq_label_recycle = sebsd_sysv_label_recycle, .mpo_sysvsem_check_semctl = sebsd_sysvsem_check_semctl, .mpo_sysvsem_check_semget = sebsd_sysvsem_check_semget, .mpo_sysvsem_check_semop = sebsd_sysvsem_check_semop, .mpo_sysvsem_label_associate = sebsd_sysvsem_label_associate, - .mpo_sysvsem_label_destroy = sebsd_destroy_ipc_label, - .mpo_sysvsem_label_init = sebsd_init_ipc_label, - .mpo_sysvsem_label_recycle = sebsd_cleanup_sysv_label, + .mpo_sysvsem_label_destroy = sebsd_ipc_label_destroy, + .mpo_sysvsem_label_init = sebsd_ipc_label_init, + .mpo_sysvsem_label_recycle = sebsd_sysv_label_recycle, .mpo_sysvshm_check_shmat = sebsd_sysvshm_check_shmat, .mpo_sysvshm_check_shmctl = sebsd_sysvshm_check_shmctl, .mpo_sysvshm_check_shmget = sebsd_sysvshm_check_shmget, .mpo_sysvshm_label_associate = sebsd_sysvshm_label_associate, - .mpo_sysvshm_label_destroy = sebsd_destroy_ipc_label, - .mpo_sysvshm_label_init = sebsd_init_ipc_label, - .mpo_sysvshm_label_recycle = sebsd_cleanup_sysv_label, + .mpo_sysvshm_label_destroy = sebsd_ipc_label_destroy, + .mpo_sysvshm_label_init = sebsd_ipc_label_init, + .mpo_sysvshm_label_recycle = sebsd_sysv_label_recycle, .mpo_task_check_get_port = sebsd_task_check_get_port, .mpo_task_label_associate = sebsd_task_create, .mpo_task_label_associate_kernel = sebsd_task_create_kernel, From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:44:52 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC40F16A60E; Sun, 21 Jan 2007 22:44:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AA54016A60C for ; Sun, 21 Jan 2007 22:44:52 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 971BE13C45E for ; Sun, 21 Jan 2007 22:44:52 +0000 (UTC) (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 l0LMiq9D066589 for ; Sun, 21 Jan 2007 22:44:52 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMiqV6066585 for perforce@freebsd.org; Sun, 21 Jan 2007 22:44:52 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:44:52 GMT Message-Id: <200701212244.l0LMiqV6066585@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 113296 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:44:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=113296 Change 113296 by millert@millert_macbook on 2007/01/21 22:44:51 Fix the OSAddAtomic warnings by converting the inline functions that just call OSAddAtomic into macros and including libkern/OSAtomic.h as needed. This fixes a bunch of warnings in things that include devfsdefs.h like the MAC Framework and the sedarwin module. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/devfs/devfs_tree.c#9 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/devfs/devfs_vfsops.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/devfs/devfsdefs.h#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/devfs/devfs_tree.c#9 (text+ko) ==== @@ -101,6 +101,8 @@ #include #include +#include + #include "devfs.h" #include "devfsdefs.h" ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/devfs/devfs_vfsops.c#5 (text+ko) ==== @@ -78,6 +78,8 @@ #include #include +#include + #include "devfs.h" #include "devfsdefs.h" ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/devfs/devfsdefs.h#5 (text+ko) ==== @@ -204,62 +204,14 @@ #define DEVFS_UNLOCK() lck_mtx_unlock(&devfs_mutex) -static __inline__ void DEVFS_INCR_ENTRIES(void); -static __inline__ void DEVFS_DECR_ENTRIES(void); -static __inline__ void DEVFS_INCR_NODES(void); -static __inline__ void DEVFS_DECR_NODES(void); -static __inline__ void DEVFS_INCR_MOUNTS(void); -static __inline__ void DEVFS_DECR_MOUNTS(void); -static __inline__ void DEVFS_INCR_STRINGSPACE(int); -static __inline__ void DEVFS_DECR_STRINGSPACE(int); - -static __inline__ void -DEVFS_INCR_ENTRIES() -{ - OSAddAtomic(1, &devfs_stats.entries); -} - -static __inline__ void -DEVFS_DECR_ENTRIES() -{ - OSAddAtomic(-1, &devfs_stats.entries); -} - -static __inline__ void -DEVFS_INCR_NODES() -{ - OSAddAtomic(1, &devfs_stats.nodes); -} - -static __inline__ void -DEVFS_DECR_NODES() -{ - OSAddAtomic(-1, &devfs_stats.nodes); -} - -static __inline__ void -DEVFS_INCR_MOUNTS() -{ - OSAddAtomic(1, &devfs_stats.mounts); -} - -static __inline__ void -DEVFS_DECR_MOUNTS() -{ - OSAddAtomic(-1, &devfs_stats.mounts); -} - -static __inline__ void -DEVFS_INCR_STRINGSPACE(int space) -{ - OSAddAtomic(space, &devfs_stats.stringspace); -} - -static __inline__ void -DEVFS_DECR_STRINGSPACE(int space) -{ - OSAddAtomic(-space, &devfs_stats.stringspace); -} +#define DEVFS_INCR_ENTRIES() OSAddAtomic(1, (SInt32 *)&devfs_stats.entries) +#define DEVFS_DECR_ENTRIES() OSAddAtomic(-1, (SInt32 *)&devfs_stats.entries) +#define DEVFS_INCR_NODES() OSAddAtomic(1, (SInt32 *)&devfs_stats.nodes) +#define DEVFS_DECR_NODES() OSAddAtomic(-1, (SInt32 *)&devfs_stats.nodes) +#define DEVFS_INCR_MOUNTS() OSAddAtomic(1, (SInt32 *)&devfs_stats.mounts) +#define DEVFS_DECR_MOUNTS() OSAddAtomic(-1, (SInt32 *)&devfs_stats.mounts) +#define DEVFS_INCR_STRINGSPACE(x) OSAddAtomic(x, (SInt32 *)&devfs_stats.stringspace) +#define DEVFS_DECR_STRINGSPACE(x) OSAddAtomic(-x, (SInt32 *)&devfs_stats.stringspace) static __inline__ void dn_times(devnode_t * dnp, struct timeval *t1, struct timeval *t2, struct timeval *t3) From owner-p4-projects@FreeBSD.ORG Sun Jan 21 22:47:57 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4278C16A405; Sun, 21 Jan 2007 22:47:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 189FF16A400 for ; Sun, 21 Jan 2007 22:47:57 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 06CC313C45E for ; Sun, 21 Jan 2007 22:47:57 +0000 (UTC) (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 l0LMlv13066804 for ; Sun, 21 Jan 2007 22:47:57 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0LMluPs066801 for perforce@freebsd.org; Sun, 21 Jan 2007 22:47:56 GMT (envelope-from millert@freebsd.org) Date: Sun, 21 Jan 2007 22:47:56 GMT Message-Id: <200701212247.l0LMluPs066801@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 113297 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 21 Jan 2007 22:47:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=113297 Change 113297 by millert@millert_macbook on 2007/01/21 22:47:40 Move to a single label struct for sedarwin. The old struct names are still supported via a macro for now as they aid in readability. They may be removed in the future if variable names improve... Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#54 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_labels.h#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#54 (text+ko) ==== @@ -97,10 +97,7 @@ int sebsd_verbose = 0; -static zone_t task_security_zone; -static zone_t network_security_zone; -static zone_t vnode_security_zone; -static zone_t ipc_security_zone; +static zone_t sebsd_label_zone; static int sebsd_slot; /* set by framework */ #define SLOT(l) ((void *)LABEL_TO_SLOT((l), sebsd_slot).l_ptr) @@ -216,25 +213,9 @@ sebsd_zone_init(void) { - /* We use task_security_struct for creds and ports too. */ - task_security_zone = mac_zinit(sizeof(struct task_security_struct), - 2048 * sizeof(struct task_security_struct), 0, - "task_security_struct"); - - /* Want to use maxsockets here. */ - network_security_zone = mac_zinit(sizeof(struct network_security_struct), - 512 * sizeof(struct network_security_struct), 0, - "network_security_struct"); - - /* Want to use desiredvnodes here. */ - vnode_security_zone = mac_zinit(sizeof(struct vnode_security_struct), - 8192 * sizeof(struct vnode_security_struct), 0, - "vnode_security_struct"); - - /* Want to use maxsockets here. */ - ipc_security_zone = mac_zinit(sizeof(struct ipc_security_struct), - 512 * sizeof(struct ipc_security_struct), 0, - "ipc_security_struct"); + sebsd_label_zone = mac_zinit(sizeof(struct sebsd_label), + 8192 * sizeof(struct sebsd_label), 0, + "sebsd_label"); } static void @@ -478,6 +459,7 @@ } /* Update security class if not set or vnode was recycled. */ + /* XXX - why is this needed? When things get recycled the class should be zeroed */ if (file->sclass == 0 || vp->v_type == VBAD) file->sclass = vnode_type_to_security_class(vp->v_type); @@ -545,81 +527,40 @@ } static void -sebsd_cred_label_init(struct label *label) +sebsd_label_init(struct label *label) { - struct task_security_struct *new_tsec; + struct sebsd_label *new; - new_tsec = mac_zalloc(task_security_zone, M_WAITOK); - new_tsec->osid = new_tsec->sid = SECINITSID_UNLABELED; - SLOT(label) = new_tsec; + new = mac_zalloc(sebsd_label_zone, M_WAITOK); + new->sid = new->task_sid = SECINITSID_UNLABELED; + new->sclass = 0; + SLOT(label) = new; } -static void -sebsd_cred_label_destroy(struct label *label) -{ - - mac_zfree(task_security_zone, SLOT(label)); - SLOT(label) = NULL; -} - -static void -sebsd_file_label_init(struct label *label) -{ - struct file_security_struct *fsec; - - fsec = sebsd_malloc(sizeof(*fsec), M_SEBSD, M_ZERO | M_WAITOK); - fsec->sid = SECINITSID_UNLABELED; - SLOT(label) = fsec; -} - -static void -sebsd_mount_label_init(struct label *label) -{ - struct mount_security_struct *sbsec; - - sbsec = sebsd_malloc(sizeof(*sbsec), M_SEBSD, M_ZERO | M_WAITOK); - sbsec->sid = SECINITSID_UNLABELED; - SLOT(label) = sbsec; -} - static int -sebsd_init_network_label_waitcheck(struct label *label, int flag) +sebsd_label_init2(struct label *label, int flag) { - struct network_security_struct *new; + struct sebsd_label *new; - new = mac_zalloc(network_security_zone, flag); - if (new == NULL) { - SLOT(label) = NULL; - return (ENOMEM); + new = mac_zalloc(sebsd_label_zone, flag); + if (new != NULL) { + new->sid = new->task_sid = SECINITSID_UNLABELED; + new->sclass = 0; } - - new->sid = new->task_sid = SECINITSID_UNLABELED; SLOT(label) = new; - return (0); + return (new ? 0 : ENOMEM); } static void -sebsd_destroy_network_label(struct label *label) +sebsd_label_destroy(struct label *label) { - mac_zfree(network_security_zone, SLOT(label)); + mac_zfree(sebsd_label_zone, SLOT(label)); SLOT(label) = NULL; } static void -sebsd_vnode_label_init(struct label *label) -{ - struct vnode_security_struct *vsec; - - vsec = mac_zalloc(vnode_security_zone, M_WAITOK); - vsec->sid = SECINITSID_UNLABELED; - vsec->task_sid = SECINITSID_UNLABELED; - vsec->sclass = 0; - SLOT(label) = vsec; -} - -static void sebsd_vnode_label_recycle(struct label *label) { struct vnode_security_struct *vsec; @@ -631,41 +572,6 @@ } static void -sebsd_vnode_label_destroy(struct label *label) -{ - - mac_zfree(vnode_security_zone, SLOT(label)); - SLOT(label) = NULL; -} - -static void -sebsd_ipc_label_init(struct label *label) -{ - struct ipc_security_struct *new; - - new = mac_zalloc(ipc_security_zone, M_WAITOK); - new->sid = SECINITSID_UNLABELED; - new->sclass = 0; - SLOT(label) = new; -} - -static void -sebsd_ipc_label_destroy(struct label *label) -{ - - mac_zfree(ipc_security_zone, SLOT(label)); - SLOT(label) = NULL; -} - -static void -sebsd_label_destroy(struct label *label) -{ - - sebsd_free(SLOT(label), M_SEBSD); - SLOT(label) = NULL; -} - -static void sebsd_cred_label_update(struct ucred *cred, struct label *newlabel) { /* @@ -948,7 +854,7 @@ static void -sebsd_cred_create(struct ucred *cred_parent, struct ucred *cred_child) +sebsd_cred_label_associate(struct ucred *cred_parent, struct ucred *cred_child) { int rc; struct task_security_struct *parent, *task; @@ -1210,7 +1116,7 @@ } static void -sebsd_create_kernel_proc(struct ucred *cred) +sebsd_cred_label_associate_kproc(struct ucred *cred) { struct task_security_struct *task; @@ -1231,75 +1137,40 @@ struct label *mntlabel) { struct mount_security_struct *sbsec; - int behavior, rc; + unsigned int behavior; + int error; /* * Update the mount label based on the policy. */ sbsec = SLOT(mntlabel); - rc = security_fs_use(mp->mnt_vfsstat.f_fstypename, &behavior, &sbsec->sid); - if (rc) { + error = security_fs_use(mp->mnt_vfsstat.f_fstypename, &behavior, + &sbsec->sid); + if (error) { sebsd_log("%s: security_fs_use(%s) returned %d", - __func__, mp->mnt_vfsstat.f_fstypename, rc); + __func__, mp->mnt_vfsstat.f_fstypename, error); behavior = SECURITY_FS_USE_NONE; } else if (sebsd_verbose > 1) { - sebsd_log("%s: security_fs_use(%s) behavior %d, sid %d", + sebsd_log("%s: security_fs_use(%s) behavior %u, sid %d", __func__, mp->mnt_vfsstat.f_fstypename, behavior, sbsec->sid); } switch (behavior) { case SECURITY_FS_USE_XATTR: - /* - * PSIDs only work for persistent file systems with unique - * and persistent inode numbers. - */ - sbsec->uses_psids = 1; - - /* - * TBD: need to correctly label mountpoint with persistent - * label at this point (currently vnode is unavailable) - */ - - break; case SECURITY_FS_USE_TRANS: - /* - * Transition SIDs are used for pseudo filesystems like - * devpts and tmpfs where you want the SID to be derived - * from the SID of the creating process and the SID of the - * filesystem. - */ - sbsec->uses_trans = 1; - break; case SECURITY_FS_USE_TASK: - /* - * Task SIDs are used for pseudo filesystems like pipefs and - * sockfs where you want the objects to be labeled with the - * SID of the creating process. - */ - sbsec->uses_task = 1; - break; case SECURITY_FS_USE_GENFS: - /* - * genfs_contexts handles everything else, like devfs, - * usbdevfs, driverfs, and portions of proc. - */ - sbsec->uses_genfs = 1; - break; case SECURITY_FS_USE_NONE: - /* - * No labeling support configured for this filesystem type. - * Don't appear to require labeling for binfmt_misc, bdev, - * or rootfs. - */ break; default: sebsd_log("%s: security_fs_use(%s) returned unrecognized " - "behavior %d", __func__, mp->mnt_vfsstat.f_fstypename, + "behavior %u", __func__, mp->mnt_vfsstat.f_fstypename, behavior); behavior = SECURITY_FS_USE_NONE; break; } + sbsec->behavior = behavior; /* note: behavior 16 bits in sbsec */ } static void @@ -1898,35 +1769,21 @@ } static int -sebsd_internalize_sid(u_int32_t *sidp, char *element_name, +sebsd_label_internalize(struct label *label, char *element_name, char *element_data) { - char context[128]; /* TBD: contexts aren't fixed size */ - size_t context_len; + struct sebsd_label *lsec; + u_int32_t context_len; + + if (strcmp("sebsd", element_name) != 0) + return (EINVAL); + lsec = SLOT(label); context_len = strlen(element_data) + 1; - if (context_len >= sizeof(context)) - return (ENAMETOOLONG); - strcpy(context, element_data); - return (security_context_to_sid(context, context_len, sidp)); -} - -#define SEBSD_INTERNALIZE_LABEL(n1,n2) \ -static int sebsd_##n1##_label_internalize(struct label *label, \ - char *element_name, char *element_data) \ -{ \ - struct n2##_security_struct *lsec; \ - lsec = SLOT(label); \ - return (sebsd_internalize_sid(&lsec->sid, element_name, \ - element_data)); \ + return (security_context_to_sid(element_data, context_len, &lsec->sid)); } -SEBSD_INTERNALIZE_LABEL(cred,task) -SEBSD_INTERNALIZE_LABEL(network,network) -SEBSD_INTERNALIZE_LABEL(vnode,vnode) -SEBSD_INTERNALIZE_LABEL(mount,mount) - static void sebsd_pipe_label_update(struct ucred *cred, struct pipe *pipe, struct label *pipelabel, struct label *newlabel) @@ -3000,21 +2857,22 @@ return (error); } -#define SEBSD_EXTERNALIZE_LABEL(n1,n2) \ -static int sebsd_##n1##_label_externalize(struct label *label, \ - char *element_name, struct sbuf *sb) \ -{ \ - struct n2##_security_struct *lsec; \ - \ - if (strcmp("sebsd", element_name) != 0) \ - return (ENOENT); \ - \ - lsec = SLOT(label); \ - return (sebsd_externalize_sid(lsec->sid, element_name, sb)); \ +static int +sebsd_label_externalize(struct label *label, char *element_name, + struct sbuf *sb) +{ + struct sebsd_label *lsec; + + if (strcmp("sebsd", element_name) != 0) + return (ENOENT); + + lsec = SLOT(label); + return (sebsd_externalize_sid(lsec->sid, element_name, sb)); } -static int sebsd_cred_label_externalize(struct label *label, - char *element_name, struct sbuf *sb) +static int +sebsd_cred_label_externalize(struct label *label, char *element_name, + struct sbuf *sb) { struct task_security_struct *tsec; u_int32_t sid; @@ -3029,10 +2887,6 @@ return (sebsd_externalize_sid(sid, element_name, sb)); } -SEBSD_EXTERNALIZE_LABEL(network,network) -SEBSD_EXTERNALIZE_LABEL(vnode,vnode) -SEBSD_EXTERNALIZE_LABEL(mount,mount) - static void sebsd_vnode_label_copy(struct label *src, struct label *dest) { @@ -3513,21 +3367,21 @@ static struct mac_policy_ops sebsd_ops = { .mpo_cred_check_label_update =sebsd_cred_check_label_update, .mpo_cred_check_label_update_execve = sebsd_cred_check_label_update_execve, - .mpo_cred_label_associate = sebsd_cred_create, - .mpo_cred_label_associate_kernel = sebsd_create_kernel_proc, - .mpo_cred_label_associate_user = sebsd_create_kernel_proc, - .mpo_cred_label_destroy = sebsd_cred_label_destroy, + .mpo_cred_label_associate = sebsd_cred_label_associate, + .mpo_cred_label_associate_kernel = sebsd_cred_label_associate_kproc, + .mpo_cred_label_associate_user = sebsd_cred_label_associate_kproc, + .mpo_cred_label_destroy = sebsd_label_destroy, .mpo_cred_label_externalize = sebsd_cred_label_externalize, .mpo_cred_label_externalize_audit = sebsd_cred_label_externalize, - .mpo_cred_label_init = sebsd_cred_label_init, - .mpo_cred_label_internalize = sebsd_cred_label_internalize, + .mpo_cred_label_init = sebsd_label_init, + .mpo_cred_label_internalize = sebsd_label_internalize, .mpo_cred_label_update = sebsd_cred_label_update, .mpo_cred_label_update_execve = sebsd_cred_label_update_execve, .mpo_devfs_label_associate_device = sebsd_devfs_label_associate_device, .mpo_devfs_label_associate_directory = sebsd_devfs_label_associate_directory, .mpo_devfs_label_copy = sebsd_vnode_label_copy, - .mpo_devfs_label_destroy = sebsd_vnode_label_destroy, - .mpo_devfs_label_init = sebsd_vnode_label_init, + .mpo_devfs_label_destroy = sebsd_label_destroy, + .mpo_devfs_label_init = sebsd_label_init, .mpo_devfs_label_update = sebsd_devfs_update, .mpo_file_check_change_offset = sebsd_file_check_change_offset, .mpo_file_check_dup = sebsd_file_check_dup, @@ -3540,11 +3394,11 @@ .mpo_file_check_receive = sebsd_file_check_receive, .mpo_file_label_associate = sebsd_file_label_associate, .mpo_file_label_destroy = sebsd_label_destroy, - .mpo_file_label_init = sebsd_file_label_init, + .mpo_file_label_init = sebsd_label_init, .mpo_mbuf_label_associate_socket = sebsd_mbuf_label_associate_socket, .mpo_mbuf_label_copy = copy_network_label, - .mpo_mbuf_label_destroy = sebsd_destroy_network_label, - .mpo_mbuf_label_init = sebsd_init_network_label_waitcheck, + .mpo_mbuf_label_destroy = sebsd_label_destroy, + .mpo_mbuf_label_init = sebsd_label_init2, .mpo_mount_check_getattr = sebsd_mount_check_getattr, .mpo_mount_check_label_update = sebsd_mount_check_label_update, .mpo_mount_check_mount = sebsd_mount_check_mount, @@ -3556,9 +3410,9 @@ .mpo_mount_check_umount = sebsd_mount_check_umount, .mpo_mount_label_associate = sebsd_mount_label_associate, .mpo_mount_label_destroy = sebsd_label_destroy, - .mpo_mount_label_externalize = sebsd_mount_label_externalize, - .mpo_mount_label_init = sebsd_mount_label_init, - .mpo_mount_label_internalize = sebsd_mount_label_internalize, + .mpo_mount_label_externalize = sebsd_label_externalize, + .mpo_mount_label_init = sebsd_label_init, + .mpo_mount_label_internalize = sebsd_label_internalize, .mpo_pipe_check_ioctl = sebsd_pipe_check_ioctl, .mpo_pipe_check_label_update = sebsd_pipe_check_label_update, .mpo_pipe_check_read = sebsd_pipe_check_read, @@ -3566,10 +3420,10 @@ .mpo_pipe_check_write = sebsd_pipe_check_write, .mpo_pipe_label_associate = sebsd_pipe_label_associate, .mpo_pipe_label_copy = sebsd_vnode_label_copy, - .mpo_pipe_label_destroy = sebsd_vnode_label_destroy, - .mpo_pipe_label_externalize = sebsd_vnode_label_externalize, - .mpo_pipe_label_init = sebsd_vnode_label_init, - .mpo_pipe_label_internalize = sebsd_vnode_label_internalize, + .mpo_pipe_label_destroy = sebsd_label_destroy, + .mpo_pipe_label_externalize = sebsd_label_externalize, + .mpo_pipe_label_init = sebsd_label_init, + .mpo_pipe_label_internalize = sebsd_label_internalize, .mpo_pipe_label_update = sebsd_pipe_label_update, .mpo_policy_destroy = sebsd_policy_destroy, .mpo_policy_init = sebsd_policy_init, @@ -3593,8 +3447,8 @@ .mpo_port_label_associate_kernel = sebsd_port_label_associate_kernel, .mpo_port_label_compute = sebsd_request_label, .mpo_port_label_copy = sebsd_task_label_copy, - .mpo_port_label_destroy = sebsd_cred_label_destroy, - .mpo_port_label_init = sebsd_cred_label_init, + .mpo_port_label_destroy = sebsd_label_destroy, + .mpo_port_label_init = sebsd_label_init, .mpo_port_label_update_cred = sebsd_port_label_update_cred, .mpo_posixsem_check_create = sebsd_posixsem_check_create, .mpo_posixsem_check_open = sebsd_posixsem_check_open, @@ -3602,8 +3456,8 @@ .mpo_posixsem_check_unlink = sebsd_posixsem_check_unlink, .mpo_posixsem_check_wait = sebsd_posixsem_check_wait, .mpo_posixsem_label_associate = sebsd_posixsem_label_associate, - .mpo_posixsem_label_destroy = sebsd_ipc_label_destroy, - .mpo_posixsem_label_init = sebsd_ipc_label_init, + .mpo_posixsem_label_destroy = sebsd_label_destroy, + .mpo_posixsem_label_init = sebsd_label_init, .mpo_posixshm_check_create = sebsd_posixshm_check_create, .mpo_posixshm_check_mmap = sebsd_posixshm_check_mmap, .mpo_posixshm_check_open = sebsd_posixshm_check_open, @@ -3611,8 +3465,8 @@ .mpo_posixshm_check_truncate = sebsd_posixshm_check_truncate, .mpo_posixshm_check_unlink = sebsd_posixshm_check_unlink, .mpo_posixshm_label_associate = sebsd_posixshm_label_associate, - .mpo_posixshm_label_destroy = sebsd_ipc_label_destroy, - .mpo_posixshm_label_init = sebsd_ipc_label_init, + .mpo_posixshm_label_destroy = sebsd_label_destroy, + .mpo_posixshm_label_init = sebsd_label_init, .mpo_proc_check_debug = sebsd_proc_check_debug, .mpo_proc_check_getaudit = sebsd_proc_check_getaudit, .mpo_proc_check_mprotect = sebsd_proc_check_mprotect, @@ -3633,16 +3487,16 @@ .mpo_socket_label_associate = sebsd_socket_label_associate, .mpo_socket_label_associate_accept = sebsd_socket_label_associate_accept, .mpo_socket_label_copy = copy_network_label, - .mpo_socket_label_destroy = sebsd_destroy_network_label, - .mpo_socket_label_externalize = sebsd_network_label_externalize, - .mpo_socket_label_init = sebsd_init_network_label_waitcheck, - .mpo_socket_label_internalize = sebsd_network_label_internalize, + .mpo_socket_label_destroy = sebsd_label_destroy, + .mpo_socket_label_externalize = sebsd_label_externalize, + .mpo_socket_label_init = sebsd_label_init2, + .mpo_socket_label_internalize = sebsd_label_internalize, .mpo_socket_label_update = sebsd_socket_label_update, .mpo_socketpeer_label_associate_mbuf = sebsd_socketpeer_label_associate_mbuf, .mpo_socketpeer_label_associate_socket = sebsd_socketpeer_label_associate_socket, - .mpo_socketpeer_label_destroy = sebsd_destroy_network_label, - .mpo_socketpeer_label_externalize = sebsd_network_label_externalize, - .mpo_socketpeer_label_init = sebsd_init_network_label_waitcheck, + .mpo_socketpeer_label_destroy = sebsd_label_destroy, + .mpo_socketpeer_label_externalize = sebsd_label_externalize, + .mpo_socketpeer_label_init = sebsd_label_init2, .mpo_system_check_acct = sebsd_system_check_acct, .mpo_system_check_audit = sebsd_system_check_audit, .mpo_system_check_auditctl = sebsd_system_check_auditctl, @@ -3653,8 +3507,8 @@ .mpo_system_check_swapoff = sebsd_system_check_swapon, .mpo_system_check_swapon = sebsd_system_check_swapon, .mpo_sysvmsg_label_associate = sebsd_sysvmsg_label_associate, - .mpo_sysvmsg_label_destroy = sebsd_ipc_label_destroy, - .mpo_sysvmsg_label_init = sebsd_ipc_label_init, + .mpo_sysvmsg_label_destroy = sebsd_label_destroy, + .mpo_sysvmsg_label_init = sebsd_label_init, .mpo_sysvmsg_label_recycle = sebsd_sysv_label_recycle, .mpo_sysvmsq_check_enqueue = sebsd_sysvmsq_check_enqueue, .mpo_sysvmsq_check_msgrcv = sebsd_sysvmsq_check_msgrcv, @@ -3663,31 +3517,31 @@ .mpo_sysvmsq_check_msqrcv = sebsd_sysvmsq_check_msqrcv, .mpo_sysvmsq_check_msqsnd = sebsd_sysvmsq_check_msqsnd, .mpo_sysvmsq_label_associate = sebsd_sysvmsq_label_associate, - .mpo_sysvmsq_label_destroy = sebsd_ipc_label_destroy, - .mpo_sysvmsq_label_init = sebsd_ipc_label_init, + .mpo_sysvmsq_label_destroy = sebsd_label_destroy, + .mpo_sysvmsq_label_init = sebsd_label_init, .mpo_sysvmsq_label_recycle = sebsd_sysv_label_recycle, .mpo_sysvsem_check_semctl = sebsd_sysvsem_check_semctl, .mpo_sysvsem_check_semget = sebsd_sysvsem_check_semget, .mpo_sysvsem_check_semop = sebsd_sysvsem_check_semop, .mpo_sysvsem_label_associate = sebsd_sysvsem_label_associate, - .mpo_sysvsem_label_destroy = sebsd_ipc_label_destroy, - .mpo_sysvsem_label_init = sebsd_ipc_label_init, + .mpo_sysvsem_label_destroy = sebsd_label_destroy, + .mpo_sysvsem_label_init = sebsd_label_init, .mpo_sysvsem_label_recycle = sebsd_sysv_label_recycle, .mpo_sysvshm_check_shmat = sebsd_sysvshm_check_shmat, .mpo_sysvshm_check_shmctl = sebsd_sysvshm_check_shmctl, .mpo_sysvshm_check_shmget = sebsd_sysvshm_check_shmget, .mpo_sysvshm_label_associate = sebsd_sysvshm_label_associate, - .mpo_sysvshm_label_destroy = sebsd_ipc_label_destroy, - .mpo_sysvshm_label_init = sebsd_ipc_label_init, + .mpo_sysvshm_label_destroy = sebsd_label_destroy, + .mpo_sysvshm_label_init = sebsd_label_init, .mpo_sysvshm_label_recycle = sebsd_sysv_label_recycle, .mpo_task_check_get_port = sebsd_task_check_get_port, .mpo_task_label_associate = sebsd_task_create, .mpo_task_label_associate_kernel = sebsd_task_create_kernel, .mpo_task_label_copy = sebsd_task_label_copy, - .mpo_task_label_destroy = sebsd_cred_label_destroy, - .mpo_task_label_externalize = sebsd_cred_label_externalize, - .mpo_task_label_init = sebsd_cred_label_init, - .mpo_task_label_internalize = sebsd_cred_label_internalize, + .mpo_task_label_destroy = sebsd_label_destroy, + .mpo_task_label_externalize = sebsd_label_externalize, + .mpo_task_label_init = sebsd_label_init, + .mpo_task_label_internalize = sebsd_label_internalize, .mpo_task_label_update = sebsd_task_label_update, .mpo_thread_userret = sebsd_thread_userret, .mpo_vnode_check_access = sebsd_vnode_check_access, @@ -3728,11 +3582,11 @@ .mpo_vnode_label_associate_singlelabel = sebsd_vnode_label_associate_singlelabel, .mpo_vnode_label_associate_socket = sebsd_vnode_label_associate_socket, .mpo_vnode_label_copy = sebsd_vnode_label_copy, - .mpo_vnode_label_destroy = sebsd_vnode_label_destroy, - .mpo_vnode_label_externalize = sebsd_vnode_label_externalize, - .mpo_vnode_label_externalize_audit = sebsd_vnode_label_externalize, - .mpo_vnode_label_init = sebsd_vnode_label_init, - .mpo_vnode_label_internalize = sebsd_vnode_label_internalize, + .mpo_vnode_label_destroy = sebsd_label_destroy, + .mpo_vnode_label_externalize = sebsd_label_externalize, + .mpo_vnode_label_externalize_audit = sebsd_label_externalize, + .mpo_vnode_label_init = sebsd_label_init, + .mpo_vnode_label_internalize = sebsd_label_internalize, .mpo_vnode_label_recycle = sebsd_vnode_label_recycle, .mpo_vnode_label_store = sebsd_vnode_label_store, .mpo_vnode_label_update = sebsd_vnode_label_update, ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_labels.h#5 (text+ko) ==== @@ -41,47 +41,19 @@ #ifndef _SYS_SECURITY_SEBSD_LABELS_H #define _SYS_SECURITY_SEBSD_LABELS_H -struct task_security_struct { - u_int32_t osid; +struct sebsd_label { + u_int32_t osid; /* task_sid for all but task_security_struct */ u_int32_t sid; -#ifdef notyet - u_int32_t exec_sid; /* exec SID */ - u_int32_t create_sid; /* fscreate SID */ -#endif + u_int16_t sclass; /* only used for vnode and ipc */ + u_int16_t behavior; /* only used for mount */ }; +#define task_sid osid -struct file_security_struct { - u_int32_t sid; -}; - -struct vnode_security_struct { - u_int32_t task_sid; - u_int32_t sid; - u_int16_t sclass; -}; +#define task_security_struct sebsd_label +#define file_security_struct sebsd_label +#define vnode_security_struct sebsd_label +#define network_security_struct sebsd_label +#define ipc_security_struct sebsd_label +#define mount_security_struct sebsd_label -struct network_security_struct { - u_int32_t sid; - u_int32_t task_sid; -}; - -struct ipc_security_struct { - u_int32_t sid; - u_int16_t sclass; -}; - -struct mount_security_struct { - u_int32_t sid; /* SID of file system */ -#ifndef __FreeBSD__ - struct psidtab *psidtab; /* persistent SID mapping */ -#endif - unsigned char uses_psids; /* uses persistent SID flag */ -#ifndef __FreeBSD__ - unsigned char initialized; /* initialization flag */ -#endif - unsigned char uses_task; /* use creating task SID for inodes */ - unsigned char uses_genfs; /* use security_genfs_sid for inodes */ - unsigned char proc; /* call procfs_set_sid */ - unsigned char uses_trans; /* call security_transition_sid */ -}; #endif /* _SYS_SECURITY_SEBSD_LABELS_H */ From owner-p4-projects@FreeBSD.ORG Mon Jan 22 05:07:51 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B328D16A40E; Mon, 22 Jan 2007 05:07:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8CCE316A403 for ; Mon, 22 Jan 2007 05:07:51 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6FD1E13C4BE for ; Mon, 22 Jan 2007 05:07:51 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0M57pxi066940 for ; Mon, 22 Jan 2007 05:07:51 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0M57pP2066937 for perforce@freebsd.org; Mon, 22 Jan 2007 05:07:51 GMT (envelope-from kevlo@freebsd.org) Date: Mon, 22 Jan 2007 05:07:51 GMT Message-Id: <200701220507.l0M57pP2066937@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 113303 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 05:07:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=113303 Change 113303 by kevlo@kevlo_rtsl on 2007/01/22 05:06:55 MFbenno_arm: Gumstix board support Affected files ... .. //depot/projects/arm/src/sys/arm/conf/GUMSTIX#1 add .. //depot/projects/arm/src/sys/arm/conf/GUMSTIX.hints#1 add .. //depot/projects/arm/src/sys/arm/include/resource.h#2 edit .. //depot/projects/arm/src/sys/arm/xscale/pxa2x0/files.gumstix#1 add .. //depot/projects/arm/src/sys/arm/xscale/pxa2x0/files.pxa2x0#1 add .. //depot/projects/arm/src/sys/arm/xscale/pxa2x0/gumstix_machdep.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/pxa2x0/if_smc_csr.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/pxa2x0/if_sn_csr.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/pxa2x0/pxa2x0_csr.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/pxa2x0/pxa2x0_dmac.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/pxa2x0/pxa2x0_gpio.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/pxa2x0/pxa2x0_icu.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/pxa2x0/pxa2x0_obio.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/pxa2x0/pxa2x0_space.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/pxa2x0/pxa2x0_timer.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/pxa2x0/pxa2x0reg.h#1 add .. //depot/projects/arm/src/sys/arm/xscale/pxa2x0/pxa2x0var.h#1 add .. //depot/projects/arm/src/sys/arm/xscale/pxa2x0/std.gumstix#1 add .. //depot/projects/arm/src/sys/arm/xscale/pxa2x0/std.pxa2x0#1 add .. //depot/projects/arm/src/sys/arm/xscale/pxa2x0/uart_bus_pxa2x0.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/pxa2x0/uart_cpu_pxa2x0.c#1 add .. //depot/projects/arm/src/sys/conf/files#60 edit .. //depot/projects/arm/src/sys/conf/options.arm#20 edit .. //depot/projects/arm/src/sys/dev/mii/miidevs#12 edit .. //depot/projects/arm/src/sys/dev/mii/smcphy.c#1 add .. //depot/projects/arm/src/sys/dev/smc/if_smc.c#1 add .. //depot/projects/arm/src/sys/dev/smc/if_smcreg.h#1 add .. //depot/projects/arm/src/sys/dev/smc/if_smcvar.h#1 add Differences ... ==== //depot/projects/arm/src/sys/arm/include/resource.h#2 (text+ko) ==== ==== //depot/projects/arm/src/sys/conf/files#60 (text+ko) ==== @@ -744,6 +744,7 @@ dev/mii/rlswitch.c optional rlswitch # XXX rue only? dev/mii/ruephy.c optional miibus | ruephy +dev/mii/smcphy.c optional miibus | smcphy dev/mii/tdkphy.c optional miibus | tdkphy dev/mii/tlphy.c optional miibus | tlphy dev/mii/ukphy.c optional miibus | mii @@ -870,6 +871,7 @@ dev/smbus/smbconf.c optional smbus dev/smbus/smbus.c optional smbus dev/smbus/smbus_if.m optional smbus +dev/smc/if_smc.c optional smc dev/sn/if_sn.c optional sn dev/sn/if_sn_isa.c optional sn isa dev/sn/if_sn_pccard.c optional sn pccard ==== //depot/projects/arm/src/sys/conf/options.arm#20 (text+ko) ==== @@ -11,6 +11,7 @@ CPU_XSCALE_80321 opt_global.h CPU_XSCALE_80219 opt_global.h CPU_XSCALE_IXP425 opt_global.h +CPU_XSCALE_PXA2X0 opt_global.h KERNPHYSADDR opt_global.h KERNVIRTADDR opt_global.h PHYSADDR opt_global.h ==== //depot/projects/arm/src/sys/dev/mii/miidevs#12 (text+ko) ==== @@ -64,6 +64,7 @@ oui REALTEK 0x000020 RealTek Semicondctor oui SEEQ 0x00a07d Seeq oui SIS 0x00e006 Silicon Integrated Systems +oui SMC 0x0005be SMC oui TDK 0x00c039 TDK oui TI 0x080028 Texas Instruments oui XAQTI 0x00e0ae XaQti Corp. @@ -181,6 +182,9 @@ /* Silicon Integrated Systems PHYs */ model xxSIS 900 0x0000 SiS 900 10/100 media interface +/* SMC */ +model SMC LAN83C183 0x0004 SMC LAN83C183 10/100 media interface + /* TDK */ model TDK 78Q2120 0x0014 TDK 78Q2120 media interface From owner-p4-projects@FreeBSD.ORG Mon Jan 22 05:19:47 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16C3C16A406; Mon, 22 Jan 2007 05:19:47 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A5FD816A404 for ; Mon, 22 Jan 2007 05:19:46 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9481613C469 for ; Mon, 22 Jan 2007 05:19:46 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0M5Jk63068549 for ; Mon, 22 Jan 2007 05:19:46 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0M5JkLE068516 for perforce@freebsd.org; Mon, 22 Jan 2007 05:19:46 GMT (envelope-from kevlo@freebsd.org) Date: Mon, 22 Jan 2007 05:19:46 GMT Message-Id: <200701220519.l0M5JkLE068516@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 113304 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 05:19:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=113304 Change 113304 by kevlo@kevlo_rtsl on 2007/01/22 05:16:56 Match bus space unmap prototype. Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/pxa2x0/pxa2x0_space.c#2 edit .. //depot/user/kevlo/bcw/Makefile#1 branch .. //depot/user/kevlo/bcw/amd64/Makefile#1 branch .. //depot/user/kevlo/bcw/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/user/kevlo/bcw/amd64/acpica/acpi_machdep.c#1 branch .. //depot/user/kevlo/bcw/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/user/kevlo/bcw/amd64/acpica/madt.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/amd64_mem.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/apic_vector.S#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/atomic.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/autoconf.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/bios.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/busdma_machdep.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/cpu_switch.S#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/db_disasm.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/db_interface.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/db_trace.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/dump_machdep.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/elf_machdep.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/exception.S#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/fpu.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/gdb_machdep.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/genassym.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/identcpu.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/in_cksum.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/initcpu.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/intr_machdep.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/io.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/io_apic.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/legacy.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/local_apic.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/locore.S#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/machdep.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/mem.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/minidump_machdep.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/mp_machdep.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/mp_watchdog.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/mpboot.S#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/mptable.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/mptable_pci.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/msi.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/nexus.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/pmap.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/prof_machdep.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/sigtramp.S#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/support.S#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/sys_machdep.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/trap.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/tsc.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/uio_machdep.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/uma_machdep.c#1 branch .. //depot/user/kevlo/bcw/amd64/amd64/vm_machdep.c#1 branch .. //depot/user/kevlo/bcw/amd64/compile/.cvsignore#1 branch .. //depot/user/kevlo/bcw/amd64/conf/.cvsignore#1 branch .. //depot/user/kevlo/bcw/amd64/conf/DEFAULTS#1 branch .. //depot/user/kevlo/bcw/amd64/conf/GENERIC#1 branch .. //depot/user/kevlo/bcw/amd64/conf/GENERIC.hints#1 branch .. //depot/user/kevlo/bcw/amd64/conf/MAC#1 branch .. //depot/user/kevlo/bcw/amd64/conf/Makefile#1 branch .. //depot/user/kevlo/bcw/amd64/conf/NOTES#1 branch .. //depot/user/kevlo/bcw/amd64/ia32/ia32_exception.S#1 branch .. //depot/user/kevlo/bcw/amd64/ia32/ia32_reg.c#1 branch .. //depot/user/kevlo/bcw/amd64/ia32/ia32_signal.c#1 branch .. //depot/user/kevlo/bcw/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/user/kevlo/bcw/amd64/ia32/ia32_syscall.c#1 branch .. //depot/user/kevlo/bcw/amd64/include/_bus.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/_inttypes.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/_limits.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/_stdint.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/_types.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/acpica_machdep.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/apicreg.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/apicvar.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/asm.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/asmacros.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/atomic.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/bus.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/bus_dma.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/clock.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/cpu.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/cpufunc.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/cputypes.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/db_machdep.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/elf.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/endian.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/exec.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/float.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/floatingpoint.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/fpu.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/frame.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/gdb_machdep.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/ieeefp.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/in_cksum.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/intr_machdep.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/iodev.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/kdb.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/legacyvar.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/limits.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/md_var.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/memdev.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/metadata.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/minidump.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/mp_watchdog.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/mptable.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/mutex.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/param.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/pc/bios.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/pc/display.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/pcb.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/pcb_ext.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/pci_cfgreg.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/pcpu.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/pmap.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/pmc_mdep.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/ppireg.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/proc.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/profile.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/psl.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/ptrace.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/reg.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/reloc.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/resource.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/runq.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/segments.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/setjmp.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/sf_buf.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/sigframe.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/signal.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/smp.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/specialreg.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/stdarg.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/sysarch.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/timerreg.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/trap.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/tss.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/ucontext.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/varargs.h#1 branch .. //depot/user/kevlo/bcw/amd64/include/vmparam.h#1 branch .. //depot/user/kevlo/bcw/amd64/isa/atpic.c#1 branch .. //depot/user/kevlo/bcw/amd64/isa/atpic_vector.S#1 branch .. //depot/user/kevlo/bcw/amd64/isa/clock.c#1 branch .. //depot/user/kevlo/bcw/amd64/isa/elcr.c#1 branch .. //depot/user/kevlo/bcw/amd64/isa/icu.h#1 branch .. //depot/user/kevlo/bcw/amd64/isa/isa.c#1 branch .. //depot/user/kevlo/bcw/amd64/isa/isa.h#1 branch .. //depot/user/kevlo/bcw/amd64/isa/isa_dma.c#1 branch .. //depot/user/kevlo/bcw/amd64/isa/nmi.c#1 branch .. //depot/user/kevlo/bcw/amd64/linux32/Makefile#1 branch .. //depot/user/kevlo/bcw/amd64/linux32/linux.h#1 branch .. //depot/user/kevlo/bcw/amd64/linux32/linux32_dummy.c#1 branch .. //depot/user/kevlo/bcw/amd64/linux32/linux32_genassym.c#1 branch .. //depot/user/kevlo/bcw/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/user/kevlo/bcw/amd64/linux32/linux32_locore.s#1 branch .. //depot/user/kevlo/bcw/amd64/linux32/linux32_machdep.c#1 branch .. //depot/user/kevlo/bcw/amd64/linux32/linux32_proto.h#1 branch .. //depot/user/kevlo/bcw/amd64/linux32/linux32_syscall.h#1 branch .. //depot/user/kevlo/bcw/amd64/linux32/linux32_sysent.c#1 branch .. //depot/user/kevlo/bcw/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/user/kevlo/bcw/amd64/linux32/syscalls.conf#1 branch .. //depot/user/kevlo/bcw/amd64/linux32/syscalls.master#1 branch .. //depot/user/kevlo/bcw/amd64/pci/pci_bus.c#1 branch .. //depot/user/kevlo/bcw/amd64/pci/pci_cfgreg.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/autoconf.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/bcopy_page.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/bcopyinout.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/blockio.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/bootconfig.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/busdma_machdep.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/copystr.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/cpufunc.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/cpufunc_asm.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/db_disasm.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/db_interface.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/db_trace.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/disassem.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/dump_machdep.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/elf_machdep.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/elf_trampoline.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/exception.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/fiq.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/fiq_subr.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/fusu.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/gdb_machdep.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/genassym.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/identcpu.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/in_cksum.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/in_cksum_arm.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/inckern.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/intr.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/irq_dispatch.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/locore.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/machdep.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/mem.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/nexus.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/nexus_io.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/nexus_io_asm.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/pmap.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/setcpsr.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/setstack.s#1 branch .. //depot/user/kevlo/bcw/arm/arm/support.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/swtch.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/sys_machdep.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/trap.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/uio_machdep.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/undefined.c#1 branch .. //depot/user/kevlo/bcw/arm/arm/vectors.S#1 branch .. //depot/user/kevlo/bcw/arm/arm/vm_machdep.c#1 branch .. //depot/user/kevlo/bcw/arm/at91/at91.c#1 branch .. //depot/user/kevlo/bcw/arm/at91/at91_mci.c#1 branch .. //depot/user/kevlo/bcw/arm/at91/at91_mcireg.h#1 branch .. //depot/user/kevlo/bcw/arm/at91/at91_pdcreg.h#1 branch .. //depot/user/kevlo/bcw/arm/at91/at91_pio.c#1 branch .. //depot/user/kevlo/bcw/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/user/kevlo/bcw/arm/at91/at91_pioreg.h#1 branch .. //depot/user/kevlo/bcw/arm/at91/at91_piovar.h#1 branch .. //depot/user/kevlo/bcw/arm/at91/at91_pmc.c#1 branch .. //depot/user/kevlo/bcw/arm/at91/at91_pmcreg.h#1 branch .. //depot/user/kevlo/bcw/arm/at91/at91_pmcvar.h#1 branch .. //depot/user/kevlo/bcw/arm/at91/at91_rtc.c#1 branch .. //depot/user/kevlo/bcw/arm/at91/at91_rtcreg.h#1 branch .. //depot/user/kevlo/bcw/arm/at91/at91_spi.c#1 branch .. //depot/user/kevlo/bcw/arm/at91/at91_spireg.h#1 branch .. //depot/user/kevlo/bcw/arm/at91/at91_ssc.c#1 branch .. //depot/user/kevlo/bcw/arm/at91/at91_sscreg.h#1 branch .. //depot/user/kevlo/bcw/arm/at91/at91_st.c#1 branch .. //depot/user/kevlo/bcw/arm/at91/at91_streg.h#1 branch .. //depot/user/kevlo/bcw/arm/at91/at91_twi.c#1 branch .. //depot/user/kevlo/bcw/arm/at91/at91_twiio.h#1 branch .. //depot/user/kevlo/bcw/arm/at91/at91_twireg.h#1 branch .. //depot/user/kevlo/bcw/arm/at91/at91_usartreg.h#1 branch .. //depot/user/kevlo/bcw/arm/at91/at91rm92reg.h#1 branch .. //depot/user/kevlo/bcw/arm/at91/at91var.h#1 branch .. //depot/user/kevlo/bcw/arm/at91/files.at91#1 branch .. //depot/user/kevlo/bcw/arm/at91/files.kb920x#1 branch .. //depot/user/kevlo/bcw/arm/at91/hints.at91rm9200#1 branch .. //depot/user/kevlo/bcw/arm/at91/hints.at91sam9261#1 branch .. //depot/user/kevlo/bcw/arm/at91/if_ate.c#1 branch .. //depot/user/kevlo/bcw/arm/at91/if_atereg.h#1 branch .. //depot/user/kevlo/bcw/arm/at91/kb920x_machdep.c#1 branch .. //depot/user/kevlo/bcw/arm/at91/ohci_atmelarm.c#1 branch .. //depot/user/kevlo/bcw/arm/at91/std.at91#1 branch .. //depot/user/kevlo/bcw/arm/at91/std.kb920x#1 branch .. //depot/user/kevlo/bcw/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/user/kevlo/bcw/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/user/kevlo/bcw/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/user/kevlo/bcw/arm/compile/.cvsignore#1 branch .. //depot/user/kevlo/bcw/arm/conf/.cvsignore#1 branch .. //depot/user/kevlo/bcw/arm/conf/AVILA#1 branch .. //depot/user/kevlo/bcw/arm/conf/EP80219#1 branch .. //depot/user/kevlo/bcw/arm/conf/IQ31244#1 branch .. //depot/user/kevlo/bcw/arm/conf/KB920X#1 branch .. //depot/user/kevlo/bcw/arm/conf/SIMICS#1 branch .. //depot/user/kevlo/bcw/arm/conf/SKYEYE#1 branch .. //depot/user/kevlo/bcw/arm/include/_bus.h#1 branch .. //depot/user/kevlo/bcw/arm/include/_inttypes.h#1 branch .. //depot/user/kevlo/bcw/arm/include/_limits.h#1 branch .. //depot/user/kevlo/bcw/arm/include/_stdint.h#1 branch .. //depot/user/kevlo/bcw/arm/include/_types.h#1 branch .. //depot/user/kevlo/bcw/arm/include/armreg.h#1 branch .. //depot/user/kevlo/bcw/arm/include/asm.h#1 branch .. //depot/user/kevlo/bcw/arm/include/asmacros.h#1 branch .. //depot/user/kevlo/bcw/arm/include/atomic.h#1 branch .. //depot/user/kevlo/bcw/arm/include/blockio.h#1 branch .. //depot/user/kevlo/bcw/arm/include/bootconfig.h#1 branch .. //depot/user/kevlo/bcw/arm/include/bus.h#1 branch .. //depot/user/kevlo/bcw/arm/include/bus_dma.h#1 branch .. //depot/user/kevlo/bcw/arm/include/clock.h#1 branch .. //depot/user/kevlo/bcw/arm/include/cpu.h#1 branch .. //depot/user/kevlo/bcw/arm/include/cpuconf.h#1 branch .. //depot/user/kevlo/bcw/arm/include/cpufunc.h#1 branch .. //depot/user/kevlo/bcw/arm/include/db_machdep.h#1 branch .. //depot/user/kevlo/bcw/arm/include/disassem.h#1 branch .. //depot/user/kevlo/bcw/arm/include/elf.h#1 branch .. //depot/user/kevlo/bcw/arm/include/endian.h#1 branch .. //depot/user/kevlo/bcw/arm/include/exec.h#1 branch .. //depot/user/kevlo/bcw/arm/include/fiq.h#1 branch .. //depot/user/kevlo/bcw/arm/include/float.h#1 branch .. //depot/user/kevlo/bcw/arm/include/floatingpoint.h#1 branch .. //depot/user/kevlo/bcw/arm/include/fp.h#1 branch .. //depot/user/kevlo/bcw/arm/include/frame.h#1 branch .. //depot/user/kevlo/bcw/arm/include/gdb_machdep.h#1 branch .. //depot/user/kevlo/bcw/arm/include/ieee.h#1 branch .. //depot/user/kevlo/bcw/arm/include/ieeefp.h#1 branch .. //depot/user/kevlo/bcw/arm/include/in_cksum.h#1 branch .. //depot/user/kevlo/bcw/arm/include/intr.h#1 branch .. //depot/user/kevlo/bcw/arm/include/katelib.h#1 branch .. //depot/user/kevlo/bcw/arm/include/kdb.h#1 branch .. //depot/user/kevlo/bcw/arm/include/limits.h#1 branch .. //depot/user/kevlo/bcw/arm/include/machdep.h#1 branch .. //depot/user/kevlo/bcw/arm/include/md_var.h#1 branch .. //depot/user/kevlo/bcw/arm/include/memdev.h#1 branch .. //depot/user/kevlo/bcw/arm/include/metadata.h#1 branch .. //depot/user/kevlo/bcw/arm/include/mutex.h#1 branch .. //depot/user/kevlo/bcw/arm/include/param.h#1 branch .. //depot/user/kevlo/bcw/arm/include/pcb.h#1 branch .. //depot/user/kevlo/bcw/arm/include/pcpu.h#1 branch .. //depot/user/kevlo/bcw/arm/include/pmap.h#1 branch .. //depot/user/kevlo/bcw/arm/include/pmc_mdep.h#1 branch .. //depot/user/kevlo/bcw/arm/include/proc.h#1 branch .. //depot/user/kevlo/bcw/arm/include/profile.h#1 branch .. //depot/user/kevlo/bcw/arm/include/psl.h#1 branch .. //depot/user/kevlo/bcw/arm/include/pte.h#1 branch .. //depot/user/kevlo/bcw/arm/include/ptrace.h#1 branch .. //depot/user/kevlo/bcw/arm/include/reg.h#1 branch .. //depot/user/kevlo/bcw/arm/include/reloc.h#1 branch .. //depot/user/kevlo/bcw/arm/include/resource.h#1 branch .. //depot/user/kevlo/bcw/arm/include/runq.h#1 branch .. //depot/user/kevlo/bcw/arm/include/setjmp.h#1 branch .. //depot/user/kevlo/bcw/arm/include/sf_buf.h#1 branch .. //depot/user/kevlo/bcw/arm/include/sigframe.h#1 branch .. //depot/user/kevlo/bcw/arm/include/signal.h#1 branch .. //depot/user/kevlo/bcw/arm/include/smp.h#1 branch .. //depot/user/kevlo/bcw/arm/include/stdarg.h#1 branch .. //depot/user/kevlo/bcw/arm/include/swi.h#1 branch .. //depot/user/kevlo/bcw/arm/include/sysarch.h#1 branch .. //depot/user/kevlo/bcw/arm/include/trap.h#1 branch .. //depot/user/kevlo/bcw/arm/include/ucontext.h#1 branch .. //depot/user/kevlo/bcw/arm/include/undefined.h#1 branch .. //depot/user/kevlo/bcw/arm/include/utrap.h#1 branch .. //depot/user/kevlo/bcw/arm/include/vmparam.h#1 branch .. //depot/user/kevlo/bcw/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/user/kevlo/bcw/arm/sa11x0/files.sa11x0#1 branch .. //depot/user/kevlo/bcw/arm/sa11x0/sa11x0.c#1 branch .. //depot/user/kevlo/bcw/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/user/kevlo/bcw/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/user/kevlo/bcw/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/user/kevlo/bcw/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/user/kevlo/bcw/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/user/kevlo/bcw/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/user/kevlo/bcw/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/user/kevlo/bcw/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/user/kevlo/bcw/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/user/kevlo/bcw/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/user/kevlo/bcw/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/user/kevlo/bcw/arm/sa11x0/std.sa11x0#1 branch .. //depot/user/kevlo/bcw/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/user/kevlo/bcw/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/user/kevlo/bcw/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/user/kevlo/bcw/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/files.ep80219#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/files.i80219#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/files.i80321#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/files.iq31244#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/i80321.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/i80321var.h#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/iq80321.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/obio.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/obio_space.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/obiovar.h#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/std.ep80219#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/std.i80219#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/std.i80321#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/std.iq31244#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/files.avila#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/std.avila#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/user/kevlo/bcw/arm/xscale/std.xscale#1 branch .. //depot/user/kevlo/bcw/arm/xscale/xscalereg.h#1 branch .. //depot/user/kevlo/bcw/arm/xscale/xscalevar.h#1 branch .. //depot/user/kevlo/bcw/boot/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/README#1 branch .. //depot/user/kevlo/bcw/boot/arm/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/Makefile.inc#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/boot0/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/boot0/README#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/boot0/main.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/boot2/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/boot2/board.h#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/bootiic/README#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/bootiic/main.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/bootspi/README#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/bootspi/main.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/arm_init.S#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/delay.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/emac.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/emac.h#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/getc.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/lib.h#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/memset.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/printf.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/reset.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/user/kevlo/bcw/boot/arm/at91/linker.cfg#1 branch .. //depot/user/kevlo/bcw/boot/common/Makefile.inc#1 branch .. //depot/user/kevlo/bcw/boot/common/bcache.c#1 branch .. //depot/user/kevlo/bcw/boot/common/boot.c#1 branch .. //depot/user/kevlo/bcw/boot/common/bootstrap.h#1 branch .. //depot/user/kevlo/bcw/boot/common/commands.c#1 branch .. //depot/user/kevlo/bcw/boot/common/console.c#1 branch .. //depot/user/kevlo/bcw/boot/common/dev_net.c#1 branch .. //depot/user/kevlo/bcw/boot/common/dev_net.h#1 branch .. //depot/user/kevlo/bcw/boot/common/devopen.c#1 branch .. //depot/user/kevlo/bcw/boot/common/help.common#1 branch .. //depot/user/kevlo/bcw/boot/common/interp.c#1 branch .. //depot/user/kevlo/bcw/boot/common/interp_backslash.c#1 branch .. //depot/user/kevlo/bcw/boot/common/interp_forth.c#1 branch .. //depot/user/kevlo/bcw/boot/common/interp_parse.c#1 branch .. //depot/user/kevlo/bcw/boot/common/isapnp.c#1 branch .. //depot/user/kevlo/bcw/boot/common/isapnp.h#1 branch .. //depot/user/kevlo/bcw/boot/common/load.c#1 branch .. //depot/user/kevlo/bcw/boot/common/load_elf.c#1 branch .. //depot/user/kevlo/bcw/boot/common/load_elf32.c#1 branch .. //depot/user/kevlo/bcw/boot/common/load_elf32_obj.c#1 branch .. //depot/user/kevlo/bcw/boot/common/load_elf64.c#1 branch .. //depot/user/kevlo/bcw/boot/common/load_elf64_obj.c#1 branch .. //depot/user/kevlo/bcw/boot/common/load_elf_obj.c#1 branch .. //depot/user/kevlo/bcw/boot/common/loader.8#1 branch .. //depot/user/kevlo/bcw/boot/common/ls.c#1 branch .. //depot/user/kevlo/bcw/boot/common/merge_help.awk#1 branch .. //depot/user/kevlo/bcw/boot/common/misc.c#1 branch .. //depot/user/kevlo/bcw/boot/common/module.c#1 branch .. //depot/user/kevlo/bcw/boot/common/newvers.sh#1 branch .. //depot/user/kevlo/bcw/boot/common/panic.c#1 branch .. //depot/user/kevlo/bcw/boot/common/pnp.c#1 branch .. //depot/user/kevlo/bcw/boot/common/pnpdata#1 branch .. //depot/user/kevlo/bcw/boot/common/reloc_elf.c#1 branch .. //depot/user/kevlo/bcw/boot/common/reloc_elf32.c#1 branch .. //depot/user/kevlo/bcw/boot/common/reloc_elf64.c#1 branch .. //depot/user/kevlo/bcw/boot/common/ufsread.c#1 branch .. //depot/user/kevlo/bcw/boot/efi/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/efi/Makefile.inc#1 branch .. //depot/user/kevlo/bcw/boot/efi/include/README#1 branch .. //depot/user/kevlo/bcw/boot/efi/include/efi.h#1 branch .. //depot/user/kevlo/bcw/boot/efi/include/efi_nii.h#1 branch .. //depot/user/kevlo/bcw/boot/efi/include/efiapi.h#1 branch .. //depot/user/kevlo/bcw/boot/efi/include/eficon.h#1 branch .. //depot/user/kevlo/bcw/boot/efi/include/efidebug.h#1 branch .. //depot/user/kevlo/bcw/boot/efi/include/efidef.h#1 branch .. //depot/user/kevlo/bcw/boot/efi/include/efidevp.h#1 branch .. //depot/user/kevlo/bcw/boot/efi/include/efierr.h#1 branch .. //depot/user/kevlo/bcw/boot/efi/include/efifpswa.h#1 branch .. //depot/user/kevlo/bcw/boot/efi/include/efifs.h#1 branch .. //depot/user/kevlo/bcw/boot/efi/include/efilib.h#1 branch .. //depot/user/kevlo/bcw/boot/efi/include/efinet.h#1 branch .. //depot/user/kevlo/bcw/boot/efi/include/efipart.h#1 branch .. //depot/user/kevlo/bcw/boot/efi/include/efiprot.h#1 branch .. //depot/user/kevlo/bcw/boot/efi/include/efipxebc.h#1 branch .. //depot/user/kevlo/bcw/boot/efi/include/efiser.h#1 branch .. //depot/user/kevlo/bcw/boot/efi/include/efistdarg.h#1 branch .. //depot/user/kevlo/bcw/boot/efi/include/i386/efibind.h#1 branch .. //depot/user/kevlo/bcw/boot/efi/include/i386/pe.h#1 branch .. //depot/user/kevlo/bcw/boot/efi/include/ia64/efibind.h#1 branch .. //depot/user/kevlo/bcw/boot/efi/include/ia64/pe.h#1 branch .. //depot/user/kevlo/bcw/boot/efi/libefi/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/efi/libefi/delay.c#1 branch .. //depot/user/kevlo/bcw/boot/efi/libefi/efi_console.c#1 branch .. //depot/user/kevlo/bcw/boot/efi/libefi/efifs.c#1 branch .. //depot/user/kevlo/bcw/boot/efi/libefi/efinet.c#1 branch .. //depot/user/kevlo/bcw/boot/efi/libefi/errno.c#1 branch .. //depot/user/kevlo/bcw/boot/efi/libefi/handles.c#1 branch .. //depot/user/kevlo/bcw/boot/efi/libefi/libefi.c#1 branch .. //depot/user/kevlo/bcw/boot/efi/libefi/time.c#1 branch .. //depot/user/kevlo/bcw/boot/ficl/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/ficl/arm/sysdep.c#1 branch .. //depot/user/kevlo/bcw/boot/ficl/arm/sysdep.h#1 branch .. //depot/user/kevlo/bcw/boot/ficl/dict.c#1 branch .. //depot/user/kevlo/bcw/boot/ficl/ficl.c#1 branch .. //depot/user/kevlo/bcw/boot/ficl/ficl.h#1 branch .. //depot/user/kevlo/bcw/boot/ficl/fileaccess.c#1 branch .. //depot/user/kevlo/bcw/boot/ficl/float.c#1 branch .. //depot/user/kevlo/bcw/boot/ficl/i386/sysdep.c#1 branch .. //depot/user/kevlo/bcw/boot/ficl/i386/sysdep.h#1 branch .. //depot/user/kevlo/bcw/boot/ficl/ia64/sysdep.c#1 branch .. //depot/user/kevlo/bcw/boot/ficl/ia64/sysdep.h#1 branch .. //depot/user/kevlo/bcw/boot/ficl/loader.c#1 branch .. //depot/user/kevlo/bcw/boot/ficl/math64.c#1 branch .. //depot/user/kevlo/bcw/boot/ficl/math64.h#1 branch .. //depot/user/kevlo/bcw/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/user/kevlo/bcw/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/user/kevlo/bcw/boot/ficl/prefix.c#1 branch .. //depot/user/kevlo/bcw/boot/ficl/search.c#1 branch .. //depot/user/kevlo/bcw/boot/ficl/softwords/classes.fr#1 branch .. //depot/user/kevlo/bcw/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/user/kevlo/bcw/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/user/kevlo/bcw/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/user/kevlo/bcw/boot/ficl/softwords/forml.fr#1 branch .. //depot/user/kevlo/bcw/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/user/kevlo/bcw/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/user/kevlo/bcw/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/user/kevlo/bcw/boot/ficl/softwords/marker.fr#1 branch .. //depot/user/kevlo/bcw/boot/ficl/softwords/oo.fr#1 branch .. //depot/user/kevlo/bcw/boot/ficl/softwords/prefix.fr#1 branch .. //depot/user/kevlo/bcw/boot/ficl/softwords/softcore.awk#1 branch .. //depot/user/kevlo/bcw/boot/ficl/softwords/softcore.fr#1 branch .. //depot/user/kevlo/bcw/boot/ficl/softwords/string.fr#1 branch .. //depot/user/kevlo/bcw/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/user/kevlo/bcw/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/user/kevlo/bcw/boot/ficl/stack.c#1 branch .. //depot/user/kevlo/bcw/boot/ficl/testmain.c#1 branch .. //depot/user/kevlo/bcw/boot/ficl/tools.c#1 branch .. //depot/user/kevlo/bcw/boot/ficl/unix.c#1 branch .. //depot/user/kevlo/bcw/boot/ficl/vm.c#1 branch .. //depot/user/kevlo/bcw/boot/ficl/words.c#1 branch .. //depot/user/kevlo/bcw/boot/forth/beastie.4th#1 branch .. //depot/user/kevlo/bcw/boot/forth/frames.4th#1 branch .. //depot/user/kevlo/bcw/boot/forth/loader.4th#1 branch .. //depot/user/kevlo/bcw/boot/forth/loader.4th.8#1 branch .. //depot/user/kevlo/bcw/boot/forth/loader.conf#1 branch .. //depot/user/kevlo/bcw/boot/forth/loader.conf.5#1 branch .. //depot/user/kevlo/bcw/boot/forth/loader.rc#1 branch .. //depot/user/kevlo/bcw/boot/forth/pnp.4th#1 branch .. //depot/user/kevlo/bcw/boot/forth/screen.4th#1 branch .. //depot/user/kevlo/bcw/boot/forth/support.4th#1 branch .. //depot/user/kevlo/bcw/boot/i386/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/i386/Makefile.inc#1 branch .. //depot/user/kevlo/bcw/boot/i386/boot0/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/i386/boot0/boot0.S#1 branch .. //depot/user/kevlo/bcw/boot/i386/boot0/boot0ext.S#1 branch .. //depot/user/kevlo/bcw/boot/i386/boot0ext/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/i386/boot0sio/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/i386/boot2/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/i386/boot2/boot1.S#1 branch .. //depot/user/kevlo/bcw/boot/i386/boot2/boot2.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/boot2/lib.h#1 branch .. //depot/user/kevlo/bcw/boot/i386/boot2/sio.S#1 branch .. //depot/user/kevlo/bcw/boot/i386/btx/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/i386/btx/Makefile.inc#1 branch .. //depot/user/kevlo/bcw/boot/i386/btx/btx/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/i386/btx/btx/btx.S#1 branch .. //depot/user/kevlo/bcw/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/user/kevlo/bcw/boot/i386/btx/lib/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/user/kevlo/bcw/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/user/kevlo/bcw/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/user/kevlo/bcw/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/user/kevlo/bcw/boot/i386/cdboot/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/i386/cdboot/cdboot.s#1 branch .. //depot/user/kevlo/bcw/boot/i386/kgzldr/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/i386/kgzldr/boot.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/kgzldr/crt.s#1 branch .. //depot/user/kevlo/bcw/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/user/kevlo/bcw/boot/i386/kgzldr/lib.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/kgzldr/sio.s#1 branch .. //depot/user/kevlo/bcw/boot/i386/kgzldr/start.s#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/biosacpi.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/bioscd.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/biosdisk.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/biosmem.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/biospci.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/biospnp.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/biossmap.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/bootinfo.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/comconsole.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/devicename.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/i386_copy.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/i386_module.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/libi386.h#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/nullconsole.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/pread.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/pxe.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/pxe.h#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/pxetramp.s#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/smbios.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/time.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/libi386/vidconsole.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/loader/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/i386/loader/conf.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/loader/help.i386#1 branch .. //depot/user/kevlo/bcw/boot/i386/loader/loader.rc#1 branch .. //depot/user/kevlo/bcw/boot/i386/loader/main.c#1 branch .. //depot/user/kevlo/bcw/boot/i386/loader/version#1 branch .. //depot/user/kevlo/bcw/boot/i386/mbr/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/i386/mbr/mbr.s#1 branch .. //depot/user/kevlo/bcw/boot/i386/pxeldr/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/user/kevlo/bcw/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/user/kevlo/bcw/boot/ia64/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/ia64/Makefile.inc#1 branch .. //depot/user/kevlo/bcw/boot/ia64/common/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/ia64/common/autoload.c#1 branch .. //depot/user/kevlo/bcw/boot/ia64/common/bootinfo.c#1 branch .. //depot/user/kevlo/bcw/boot/ia64/common/copy.c#1 branch .. //depot/user/kevlo/bcw/boot/ia64/common/devicename.c#1 branch .. //depot/user/kevlo/bcw/boot/ia64/common/exec.c#1 branch .. //depot/user/kevlo/bcw/boot/ia64/common/libia64.h#1 branch .. //depot/user/kevlo/bcw/boot/ia64/efi/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/ia64/efi/conf.c#1 branch .. //depot/user/kevlo/bcw/boot/ia64/efi/efimd.c#1 branch .. //depot/user/kevlo/bcw/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/user/kevlo/bcw/boot/ia64/efi/main.c#1 branch .. //depot/user/kevlo/bcw/boot/ia64/efi/start.S#1 branch .. //depot/user/kevlo/bcw/boot/ia64/efi/version#1 branch .. //depot/user/kevlo/bcw/boot/ia64/ski/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/user/kevlo/bcw/boot/ia64/ski/conf.c#1 branch .. //depot/user/kevlo/bcw/boot/ia64/ski/delay.c#1 branch .. //depot/user/kevlo/bcw/boot/ia64/ski/efi_stub.c#1 branch .. //depot/user/kevlo/bcw/boot/ia64/ski/exit.c#1 branch .. //depot/user/kevlo/bcw/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/user/kevlo/bcw/boot/ia64/ski/libski.h#1 branch .. //depot/user/kevlo/bcw/boot/ia64/ski/main.c#1 branch .. //depot/user/kevlo/bcw/boot/ia64/ski/pal_stub.S#1 branch .. //depot/user/kevlo/bcw/boot/ia64/ski/sal_stub.c#1 branch .. //depot/user/kevlo/bcw/boot/ia64/ski/skiconsole.c#1 branch .. //depot/user/kevlo/bcw/boot/ia64/ski/skifs.c#1 branch .. //depot/user/kevlo/bcw/boot/ia64/ski/skiload.cmd#1 branch .. //depot/user/kevlo/bcw/boot/ia64/ski/skimd.c#1 branch .. //depot/user/kevlo/bcw/boot/ia64/ski/ssc.c#1 branch .. //depot/user/kevlo/bcw/boot/ia64/ski/start.S#1 branch .. //depot/user/kevlo/bcw/boot/ia64/ski/time.c#1 branch .. //depot/user/kevlo/bcw/boot/ia64/ski/version#1 branch .. //depot/user/kevlo/bcw/boot/ofw/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/ofw/common/Makefile.inc#1 branch .. //depot/user/kevlo/bcw/boot/ofw/common/main.c#1 branch .. //depot/user/kevlo/bcw/boot/ofw/libofw/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/ofw/libofw/devicename.c#1 branch .. //depot/user/kevlo/bcw/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/user/kevlo/bcw/boot/ofw/libofw/libofw.h#1 branch .. //depot/user/kevlo/bcw/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/user/kevlo/bcw/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/user/kevlo/bcw/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/user/kevlo/bcw/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/user/kevlo/bcw/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/user/kevlo/bcw/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/user/kevlo/bcw/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/user/kevlo/bcw/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/user/kevlo/bcw/boot/ofw/libofw/openfirm.c#1 branch .. //depot/user/kevlo/bcw/boot/ofw/libofw/openfirm.h#1 branch .. //depot/user/kevlo/bcw/boot/ofw/libofw/openfirm_mmu.c#1 branch .. //depot/user/kevlo/bcw/boot/pc98/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/pc98/Makefile.inc#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot0.5/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot0.5/boot.s#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot0.5/disk.s#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot0.5/selector.s#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot0.5/start.s#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot0.5/support.s#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot0/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot0/boot0.s#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot2/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot2/README.serial.98#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot2/asm.S#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot2/asm.h#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot2/bios.S#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot2/boot.c#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot2/boot.h#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot2/boot2.S#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot2/dinode.h#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot2/disk.c#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot2/fs.h#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot2/inode.h#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot2/io.c#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot2/quota.h#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot2/serial.S#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot2/start.S#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot2/sys.c#1 branch .. //depot/user/kevlo/bcw/boot/pc98/boot2/table.c#1 branch .. //depot/user/kevlo/bcw/boot/pc98/btx/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/pc98/btx/Makefile.inc#1 branch .. //depot/user/kevlo/bcw/boot/pc98/btx/btx/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/pc98/btx/btx/btx.S#1 branch .. //depot/user/kevlo/bcw/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/user/kevlo/bcw/boot/pc98/btx/lib/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/user/kevlo/bcw/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/user/kevlo/bcw/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/user/kevlo/bcw/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/user/kevlo/bcw/boot/pc98/cdboot/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/user/kevlo/bcw/boot/pc98/kgzldr/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/pc98/kgzldr/crt.s#1 branch .. //depot/user/kevlo/bcw/boot/pc98/libpc98/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/user/kevlo/bcw/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/user/kevlo/bcw/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/user/kevlo/bcw/boot/pc98/libpc98/biossmap.c#1 branch .. //depot/user/kevlo/bcw/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/user/kevlo/bcw/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/user/kevlo/bcw/boot/pc98/libpc98/time.c#1 branch .. //depot/user/kevlo/bcw/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/user/kevlo/bcw/boot/pc98/loader/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/pc98/loader/conf.c#1 branch .. //depot/user/kevlo/bcw/boot/pc98/loader/help.pc98#1 branch .. //depot/user/kevlo/bcw/boot/pc98/loader/main.c#1 branch .. //depot/user/kevlo/bcw/boot/powerpc/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/powerpc/loader/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/powerpc/loader/conf.c#1 branch .. //depot/user/kevlo/bcw/boot/powerpc/loader/help.ofw#1 branch .. //depot/user/kevlo/bcw/boot/powerpc/loader/ldscript.powerpc#1 branch .. //depot/user/kevlo/bcw/boot/powerpc/loader/metadata.c#1 branch .. //depot/user/kevlo/bcw/boot/powerpc/loader/start.c#1 branch .. //depot/user/kevlo/bcw/boot/powerpc/loader/version#1 branch .. //depot/user/kevlo/bcw/boot/sparc64/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/sparc64/Makefile.inc#1 branch .. //depot/user/kevlo/bcw/boot/sparc64/boot1/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/sparc64/boot1/_start.s#1 branch .. //depot/user/kevlo/bcw/boot/sparc64/boot1/boot1.c#1 branch .. //depot/user/kevlo/bcw/boot/sparc64/loader/Makefile#1 branch .. //depot/user/kevlo/bcw/boot/sparc64/loader/help.sparc64#1 branch .. //depot/user/kevlo/bcw/boot/sparc64/loader/locore.S#1 branch .. //depot/user/kevlo/bcw/boot/sparc64/loader/main.c#1 branch .. //depot/user/kevlo/bcw/boot/sparc64/loader/metadata.c#1 branch .. //depot/user/kevlo/bcw/boot/sparc64/loader/version#1 branch .. //depot/user/kevlo/bcw/bsm/audit.h#1 branch .. //depot/user/kevlo/bcw/bsm/audit_internal.h#1 branch .. //depot/user/kevlo/bcw/bsm/audit_kevents.h#1 branch .. //depot/user/kevlo/bcw/bsm/audit_record.h#1 branch .. //depot/user/kevlo/bcw/cam/cam.c#1 branch .. //depot/user/kevlo/bcw/cam/cam.h#1 branch .. //depot/user/kevlo/bcw/cam/cam_ccb.h#1 branch .. //depot/user/kevlo/bcw/cam/cam_debug.h#1 branch .. //depot/user/kevlo/bcw/cam/cam_periph.c#1 branch .. //depot/user/kevlo/bcw/cam/cam_periph.h#1 branch .. //depot/user/kevlo/bcw/cam/cam_queue.c#1 branch .. //depot/user/kevlo/bcw/cam/cam_queue.h#1 branch .. //depot/user/kevlo/bcw/cam/cam_sim.c#1 branch .. //depot/user/kevlo/bcw/cam/cam_sim.h#1 branch .. //depot/user/kevlo/bcw/cam/cam_xpt.c#1 branch .. //depot/user/kevlo/bcw/cam/cam_xpt.h#1 branch .. //depot/user/kevlo/bcw/cam/cam_xpt_periph.h#1 branch .. //depot/user/kevlo/bcw/cam/cam_xpt_sim.h#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_all.c#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_all.h#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_cd.c#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_cd.h#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_ch.c#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_ch.h#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_da.c#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_da.h#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_iu.h#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_low.c#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_low.h#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_message.h#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_pass.c#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_pass.h#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_pt.c#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_pt.h#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_sa.c#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_sa.h#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_ses.c#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_ses.h#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_target.c#1 branch .. //depot/user/kevlo/bcw/cam/scsi/scsi_targetio.h#1 branch .. //depot/user/kevlo/bcw/coda/00READ#1 branch .. //depot/user/kevlo/bcw/coda/README#1 branch .. //depot/user/kevlo/bcw/coda/TODO#1 branch .. //depot/user/kevlo/bcw/coda/cnode.h#1 branch .. //depot/user/kevlo/bcw/coda/coda.h#1 branch .. //depot/user/kevlo/bcw/coda/coda_fbsd.c#1 branch .. //depot/user/kevlo/bcw/coda/coda_io.h#1 branch .. //depot/user/kevlo/bcw/coda/coda_kernel.h#1 branch .. //depot/user/kevlo/bcw/coda/coda_namecache.c#1 branch .. //depot/user/kevlo/bcw/coda/coda_namecache.h#1 branch .. //depot/user/kevlo/bcw/coda/coda_opstats.h#1 branch .. //depot/user/kevlo/bcw/coda/coda_pioctl.h#1 branch .. //depot/user/kevlo/bcw/coda/coda_psdev.c#1 branch .. //depot/user/kevlo/bcw/coda/coda_psdev.h#1 branch .. //depot/user/kevlo/bcw/coda/coda_subr.c#1 branch .. //depot/user/kevlo/bcw/coda/coda_subr.h#1 branch .. //depot/user/kevlo/bcw/coda/coda_venus.c#1 branch .. //depot/user/kevlo/bcw/coda/coda_venus.h#1 branch .. //depot/user/kevlo/bcw/coda/coda_vfsops.c#1 branch .. //depot/user/kevlo/bcw/coda/coda_vfsops.h#1 branch .. //depot/user/kevlo/bcw/coda/coda_vnops.c#1 branch .. //depot/user/kevlo/bcw/coda/coda_vnops.h#1 branch .. //depot/user/kevlo/bcw/compat/freebsd32/Makefile#1 branch .. //depot/user/kevlo/bcw/compat/freebsd32/freebsd32.h#1 branch .. //depot/user/kevlo/bcw/compat/freebsd32/freebsd32_misc.c#1 branch .. //depot/user/kevlo/bcw/compat/freebsd32/freebsd32_proto.h#1 branch .. //depot/user/kevlo/bcw/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/user/kevlo/bcw/compat/freebsd32/freebsd32_syscall.h#1 branch .. //depot/user/kevlo/bcw/compat/freebsd32/freebsd32_syscalls.c#1 branch .. //depot/user/kevlo/bcw/compat/freebsd32/freebsd32_sysent.c#1 branch .. //depot/user/kevlo/bcw/compat/freebsd32/freebsd32_util.h#1 branch .. //depot/user/kevlo/bcw/compat/freebsd32/syscalls.conf#1 branch .. //depot/user/kevlo/bcw/compat/freebsd32/syscalls.master#1 branch .. //depot/user/kevlo/bcw/compat/ia32/ia32_genassym.c#1 branch .. //depot/user/kevlo/bcw/compat/ia32/ia32_reg.h#1 branch .. //depot/user/kevlo/bcw/compat/ia32/ia32_signal.h#1 branch .. //depot/user/kevlo/bcw/compat/ia32/ia32_sysvec.c#1 branch .. //depot/user/kevlo/bcw/compat/ia32/ia32_util.h#1 branch .. //depot/user/kevlo/bcw/compat/linprocfs/linprocfs.c#1 branch .. //depot/user/kevlo/bcw/compat/linsysfs/linsysfs.c#1 branch .. //depot/user/kevlo/bcw/compat/linux/linux_emul.c#1 branch .. //depot/user/kevlo/bcw/compat/linux/linux_emul.h#1 branch .. //depot/user/kevlo/bcw/compat/linux/linux_file.c#1 branch .. //depot/user/kevlo/bcw/compat/linux/linux_futex.c#1 branch .. //depot/user/kevlo/bcw/compat/linux/linux_futex.h#1 branch .. //depot/user/kevlo/bcw/compat/linux/linux_getcwd.c#1 branch .. //depot/user/kevlo/bcw/compat/linux/linux_ioctl.c#1 branch .. //depot/user/kevlo/bcw/compat/linux/linux_ioctl.h#1 branch .. //depot/user/kevlo/bcw/compat/linux/linux_ipc.c#1 branch .. //depot/user/kevlo/bcw/compat/linux/linux_ipc.h#1 branch .. //depot/user/kevlo/bcw/compat/linux/linux_mib.c#1 branch .. //depot/user/kevlo/bcw/compat/linux/linux_mib.h#1 branch .. //depot/user/kevlo/bcw/compat/linux/linux_misc.c#1 branch .. //depot/user/kevlo/bcw/compat/linux/linux_misc.h#1 branch .. //depot/user/kevlo/bcw/compat/linux/linux_signal.c#1 branch .. //depot/user/kevlo/bcw/compat/linux/linux_signal.h#1 branch .. //depot/user/kevlo/bcw/compat/linux/linux_socket.c#1 branch .. //depot/user/kevlo/bcw/compat/linux/linux_socket.h#1 branch .. //depot/user/kevlo/bcw/compat/linux/linux_stats.c#1 branch .. //depot/user/kevlo/bcw/compat/linux/linux_sysctl.c#1 branch .. //depot/user/kevlo/bcw/compat/linux/linux_sysproto.h#1 branch .. //depot/user/kevlo/bcw/compat/linux/linux_time.c#1 branch .. //depot/user/kevlo/bcw/compat/linux/linux_uid16.c#1 branch .. //depot/user/kevlo/bcw/compat/linux/linux_util.c#1 branch .. //depot/user/kevlo/bcw/compat/linux/linux_util.h#1 branch .. //depot/user/kevlo/bcw/compat/ndis/cfg_var.h#1 branch .. //depot/user/kevlo/bcw/compat/ndis/hal_var.h#1 branch .. //depot/user/kevlo/bcw/compat/ndis/kern_ndis.c#1 branch .. //depot/user/kevlo/bcw/compat/ndis/kern_windrv.c#1 branch .. //depot/user/kevlo/bcw/compat/ndis/ndis_var.h#1 branch .. //depot/user/kevlo/bcw/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/user/kevlo/bcw/compat/ndis/pe_var.h#1 branch .. //depot/user/kevlo/bcw/compat/ndis/resource_var.h#1 branch .. //depot/user/kevlo/bcw/compat/ndis/subr_hal.c#1 branch .. //depot/user/kevlo/bcw/compat/ndis/subr_ndis.c#1 branch .. //depot/user/kevlo/bcw/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/user/kevlo/bcw/compat/ndis/subr_pe.c#1 branch .. //depot/user/kevlo/bcw/compat/ndis/subr_usbd.c#1 branch .. //depot/user/kevlo/bcw/compat/ndis/usbd_var.h#1 branch .. //depot/user/kevlo/bcw/compat/ndis/winx32_wrap.S#1 branch .. //depot/user/kevlo/bcw/compat/ndis/winx64_wrap.S#1 branch .. //depot/user/kevlo/bcw/compat/netbsd/dvcfg.h#1 branch .. //depot/user/kevlo/bcw/compat/netbsd/physio_proc.h#1 branch .. //depot/user/kevlo/bcw/compat/pecoff/imgact_pecoff.c#1 branch .. //depot/user/kevlo/bcw/compat/pecoff/imgact_pecoff.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/Makefile#1 branch .. //depot/user/kevlo/bcw/compat/svr4/imgact_svr4.c#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_acl.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_dirent.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_errno.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_exec.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_fcntl.c#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_fcntl.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_filio.c#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_filio.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_fuser.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_hrt.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_ioctl.c#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_ioctl.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_ipc.c#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_ipc.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_misc.c#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_mman.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_proto.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_resource.c#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_resource.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_siginfo.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_signal.c#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_signal.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_socket.c#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_socket.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_sockio.c#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_sockio.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_sockmod.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_stat.c#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_stat.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_statvfs.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_stream.c#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_stropts.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_syscall.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_syscallnames.c#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_sysconfig.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_sysent.c#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_systeminfo.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_sysvec.c#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_termios.c#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_termios.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_time.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_timod.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_ttold.c#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_ttold.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_types.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_ucontext.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_ulimit.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_ustat.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_util.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_utsname.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/svr4_wait.h#1 branch .. //depot/user/kevlo/bcw/compat/svr4/syscalls.conf#1 branch .. //depot/user/kevlo/bcw/compat/svr4/syscalls.master#1 branch .. //depot/user/kevlo/bcw/conf/Makefile.amd64#1 branch .. //depot/user/kevlo/bcw/conf/Makefile.arm#1 branch .. //depot/user/kevlo/bcw/conf/Makefile.i386#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 22 05:42:14 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B423E16A407; Mon, 22 Jan 2007 05:42:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 72D8A16A402 for ; Mon, 22 Jan 2007 05:42:14 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6416113C441 for ; Mon, 22 Jan 2007 05:42:14 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0M5gEf8072486 for ; Mon, 22 Jan 2007 05:42:14 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0M5gE9W072483 for perforce@freebsd.org; Mon, 22 Jan 2007 05:42:14 GMT (envelope-from kevlo@freebsd.org) Date: Mon, 22 Jan 2007 05:42:14 GMT Message-Id: <200701220542.l0M5gE9W072483@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 113305 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 05:42:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=113305 Change 113305 by kevlo@kevlo_rtsl on 2007/01/22 05:41:56 Cleanup. Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/pxa2x0/gumstix_machdep.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/pxa2x0/gumstix_machdep.c#2 (text+ko) ==== @@ -407,8 +407,6 @@ physmem = 0; for (i = 0; i < PXA2X0_SDRAM_BANKS; i++) { physmem += memsize[i] / PAGE_SIZE; - if (memsize[i] != 0) - avail_end = memstart[i] + memsize[i] - 1; } /* Fire up consoles. */ @@ -420,7 +418,7 @@ undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); - proc_linkup(&proc0, &ksegrp0, &thread0); + proc_linkup(&proc0, &thread0); thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; From owner-p4-projects@FreeBSD.ORG Mon Jan 22 05:46:21 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E377616A404; Mon, 22 Jan 2007 05:46:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 96F5716A402 for ; Mon, 22 Jan 2007 05:46:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 88B3913C442 for ; Mon, 22 Jan 2007 05:46:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0M5kK1V073065 for ; Mon, 22 Jan 2007 05:46:20 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0M5kK78073062 for perforce@freebsd.org; Mon, 22 Jan 2007 05:46:20 GMT (envelope-from sam@freebsd.org) Date: Mon, 22 Jan 2007 05:46:20 GMT Message-Id: <200701220546.l0M5kK78073062@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 113306 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 05:46:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=113306 Change 113306 by sam@sam_ebb on 2007/01/22 05:46:15 fix compilation with ATH_DEBUG Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#128 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#128 (text+ko) ==== @@ -4802,7 +4802,7 @@ ath_printtxbuf(bf, txq->axq_qnum, ix, ath_hal_txprocdesc(ah, bf->bf_desc, &bf->bf_status.ds_txstat) == HAL_OK); - ieee80211_dump_pkt(mtod(bf->bf_m, caddr_t), + ieee80211_dump_pkt(&sc->sc_ic, mtod(bf->bf_m, caddr_t), bf->bf_m->m_len, 0, -1); } #endif /* ATH_DEBUG */ @@ -4869,7 +4869,7 @@ ath_printtxbuf(bf, sc->sc_bhalq, 0, ath_hal_txprocdesc(ah, bf->bf_desc, &bf->bf_status.ds_txstat) == HAL_OK); - ieee80211_dump_pkt(mtod(bf->bf_m, caddr_t), + ieee80211_dump_pkt(&sc->sc_ic, mtod(bf->bf_m, caddr_t), bf->bf_m->m_len, 0, -1); } } From owner-p4-projects@FreeBSD.ORG Mon Jan 22 11:24:26 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17EB416A406; Mon, 22 Jan 2007 11:24:26 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CF68916A405 for ; Mon, 22 Jan 2007 11:24:25 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C01F213C469 for ; Mon, 22 Jan 2007 11:24:25 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0MBOPD7041420 for ; Mon, 22 Jan 2007 11:24:25 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MBOPDx041417 for perforce@freebsd.org; Mon, 22 Jan 2007 11:24:25 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 22 Jan 2007 11:24:25 GMT Message-Id: <200701221124.l0MBOPDx041417@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 113307 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 11:24:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=113307 Change 113307 by zec@zec_tca51 on 2007/01/22 11:24:04 Set / restore curvnetb in vfs_hang_addrlist() - a hack to allow NFS exports to work from a system running on a kernel compiled with options VIMAGE. Affected files ... .. //depot/projects/vimage/src/sys/kern/vfs_export.c#4 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/vfs_export.c#4 (text+ko) ==== @@ -37,6 +37,8 @@ #include __FBSDID("$FreeBSD: src/sys/kern/vfs_export.c,v 1.339 2006/12/16 15:50:36 rodrigc Exp $"); +#include "opt_vimage.h" + #include #include #include @@ -50,6 +52,7 @@ #include #include #include +#include #include @@ -129,6 +132,7 @@ } #endif + CURVNETB_SET(curthread->td_vimage->v_vnetb); /* XXX MARKO */ i = sizeof(struct netcred) + argp->ex_addrlen + argp->ex_masklen; np = (struct netcred *) malloc(i, M_NETADDR, M_WAITOK | M_ZERO); saddr = (struct sockaddr *) (np + 1); @@ -183,8 +187,10 @@ bcopy(argp->ex_anon.cr_groups, np->netc_anon.cr_groups, sizeof(np->netc_anon.cr_groups)); refcount_init(&np->netc_anon.cr_ref, 1); + CURVNETB_RESTORE(); return (0); out: + CURVNETB_RESTORE(); free(np, M_NETADDR); return (error); } From owner-p4-projects@FreeBSD.ORG Mon Jan 22 11:28:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32FA516A405; Mon, 22 Jan 2007 11:28:32 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0DC9016A403 for ; Mon, 22 Jan 2007 11:28:32 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DA33F13C442 for ; Mon, 22 Jan 2007 11:28:31 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0MBSVOW041735 for ; Mon, 22 Jan 2007 11:28:31 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MBSVkb041732 for perforce@freebsd.org; Mon, 22 Jan 2007 11:28:31 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 22 Jan 2007 11:28:31 GMT Message-Id: <200701221128.l0MBSVkb041732@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 113309 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 11:28:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=113309 Change 113309 by zec@zec_tca51 on 2007/01/22 11:27:57 Remove "nooptions NFS_ROOT" from the VIMAGE config file, since this compiles fine now. I have no clue yet whether NFS_ROOT actually works... Affected files ... .. //depot/projects/vimage/src/sys/i386/conf/VIMAGE#6 edit Differences ... ==== //depot/projects/vimage/src/sys/i386/conf/VIMAGE#6 (text+ko) ==== @@ -14,5 +14,4 @@ # from the configuration for now. # -nooptions NFS_ROOT nodevice gif From owner-p4-projects@FreeBSD.ORG Mon Jan 22 13:58:44 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E0B6416A404; Mon, 22 Jan 2007 13:58:43 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9D27016A401 for ; Mon, 22 Jan 2007 13:58:43 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8B10F13C441 for ; Mon, 22 Jan 2007 13:58:43 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0MDwhAH084514 for ; Mon, 22 Jan 2007 13:58:43 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MDweiP084511 for perforce@freebsd.org; Mon, 22 Jan 2007 13:58:40 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 22 Jan 2007 13:58:40 GMT Message-Id: <200701221358.l0MDweiP084511@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 113311 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 13:58:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=113311 Change 113311 by zec@zec_tca51 on 2007/01/22 13:58:22 IFC @ 113308 Affected files ... .. //depot/projects/vimage/src/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/arm/arm/busdma_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/uart_dev_at91usart.c#3 integrate .. //depot/projects/vimage/src/sys/arm/include/bus_dma.h#2 integrate .. //depot/projects/vimage/src/sys/arm/include/md_var.h#2 integrate .. //depot/projects/vimage/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/vimage/src/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_pci.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425var.h#2 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_emul.c#4 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/vimage/src/sys/conf/files.sparc64#3 integrate .. //depot/projects/vimage/src/sys/conf/options#7 integrate .. //depot/projects/vimage/src/sys/conf/options.sun4v#2 integrate .. //depot/projects/vimage/src/sys/ddb/db_command.c#2 integrate .. //depot/projects/vimage/src/sys/ddb/db_thread.c#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/vimage/src/sys/dev/dpt/dpt.h#2 integrate .. //depot/projects/vimage/src/sys/dev/dpt/dpt_eisa.c#3 integrate .. //depot/projects/vimage/src/sys/dev/dpt/dpt_scsi.c#2 integrate .. //depot/projects/vimage/src/sys/dev/esp/esp_sbus.c#3 integrate .. //depot/projects/vimage/src/sys/dev/fb/creator.c#2 integrate .. //depot/projects/vimage/src/sys/dev/fb/creatorreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp.c#5 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_freebsd.h#3 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_sbus.c#4 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_target.c#3 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_target.h#2 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/vimage/src/sys/dev/isp/ispvar.h#3 integrate .. //depot/projects/vimage/src/sys/dev/le/if_le_cbus.c#2 integrate .. //depot/projects/vimage/src/sys/dev/le/if_le_isa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/le/if_le_lebuffer.c#1 branch .. //depot/projects/vimage/src/sys/dev/le/if_le_ledma.c#2 integrate .. //depot/projects/vimage/src/sys/dev/le/if_le_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/le/lance.c#3 integrate .. //depot/projects/vimage/src/sys/dev/le/lebuffer_sbus.c#1 branch .. //depot/projects/vimage/src/sys/dev/mc146818/mc146818reg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfi_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/brgphy.c#5 integrate .. //depot/projects/vimage/src/sys/dev/mii/mii.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/rlphy.c#4 integrate .. //depot/projects/vimage/src/sys/dev/mii/ukphy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/pci/pcireg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/re/if_re.c#4 integrate .. //depot/projects/vimage/src/sys/dev/si/si.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sk/if_sk.c#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac_private.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/sbus/cs4231.c#2 integrate .. //depot/projects/vimage/src/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/vimage/src/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ti/if_ti.c#2 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_cpu.h#2 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_dev_sab82532.c#2 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_dev_z8530.c#2 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_kbd_sun.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/ums.c#2 integrate .. //depot/projects/vimage/src/sys/fs/deadfs/dead_vnops.c#2 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/denode.h#2 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_fat.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/vimage/src/sys/kern/init_main.c#5 integrate .. //depot/projects/vimage/src/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_resource.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_sig.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_subr.c#4 integrate .. //depot/projects/vimage/src/sys/kern/sched_ule.c#4 integrate .. //depot/projects/vimage/src/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/vimage/src/sys/kern/subr_witness.c#2 integrate .. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/vimage/src/sys/modules/le/Makefile#2 integrate .. //depot/projects/vimage/src/sys/net/bridgestp.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_ppp.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_asconf.c#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_asconf.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_auth.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_bsd_addr.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_constants.h#4 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_crc32.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_indata.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_input.c#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_input.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_os.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_os_bsd.h#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.h#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_peeloff.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_peeloff.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_structs.h#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_timer.c#4 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_timer.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_var.h#4 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.c#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.h#4 integrate .. //depot/projects/vimage/src/sys/netinet6/icmp6.c#5 integrate .. //depot/projects/vimage/src/sys/netinet6/sctp6_usrreq.c#5 integrate .. //depot/projects/vimage/src/sys/netinet6/sctp6_var.h#2 integrate .. //depot/projects/vimage/src/sys/pci/if_rl.c#4 integrate .. //depot/projects/vimage/src/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/vimage/src/sys/pci/intpm.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/creator/creator.h#2 delete .. //depot/projects/vimage/src/sys/sparc64/creator/creator_upa.c#2 delete .. //depot/projects/vimage/src/sys/sparc64/include/bus.h#2 integrate .. //depot/projects/vimage/src/sys/sparc64/include/cache.h#2 integrate .. //depot/projects/vimage/src/sys/sparc64/include/frame.h#2 integrate .. //depot/projects/vimage/src/sys/sparc64/include/fsr.h#2 integrate .. //depot/projects/vimage/src/sys/sparc64/include/intr_machdep.h#2 integrate .. //depot/projects/vimage/src/sys/sparc64/include/pcb.h#2 integrate .. //depot/projects/vimage/src/sys/sparc64/include/tsb.h#2 integrate .. //depot/projects/vimage/src/sys/sparc64/isa/isa.c#2 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/ofw_pci_if.m#2 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/bus_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/genassym.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/interrupt.S#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/mp_exception.S#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/mp_locore.S#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/ofw_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/support.S#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/swtch.S#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/upa.c#1 branch .. //depot/projects/vimage/src/sys/sun4v/include/bus.h#2 integrate .. //depot/projects/vimage/src/sys/sun4v/include/frame.h#2 integrate .. //depot/projects/vimage/src/sys/sun4v/include/fsr.h#2 integrate .. //depot/projects/vimage/src/sys/sun4v/include/intr_machdep.h#2 integrate .. //depot/projects/vimage/src/sys/sun4v/include/pcb.h#2 integrate .. //depot/projects/vimage/src/sys/sun4v/include/utrap.h#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/bus_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/exception.S#3 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/hv_pci.c#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/interrupt.S#3 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/mp_locore.S#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/support.S#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/swtch.S#2 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/wbuf.S#3 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/quota.h#2 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/vimage/src/sys/vm/vm_object.c#3 integrate .. //depot/projects/vimage/src/sys/vm/vm_pageout.c#2 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/include/md_var.h#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/include/md_var.h,v 1.78 2006/06/19 22:36:01 davidxu Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.80 2007/01/18 05:46:32 rodrigc Exp $ */ #ifndef _MACHINE_MD_VAR_H_ ==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_machdep.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.26 2007/01/14 16:20:37 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.27 2007/01/20 14:58:59 netchild Exp $"); #include #include @@ -453,14 +453,21 @@ linux_fork(struct thread *td, struct linux_fork_args *args) { int error; + struct proc *p2; + struct thread *td2; #ifdef DEBUG if (ldebug(fork)) printf(ARGS(fork, "")); #endif - if ((error = fork(td, (struct fork_args *)args)) != 0) + if ((error = fork1(td, RFFDG | RFPROC | RFSTOPPED, 0, &p2)) != 0) return (error); + + if (error == 0) { + td->td_retval[0] = p2->p_pid; + td->td_retval[1] = 0; + } if (td->td_retval[1] == 1) td->td_retval[0] = 0; @@ -468,6 +475,14 @@ if (error) return (error); + td2 = FIRST_THREAD_IN_PROC(p2); + + /* make it run */ + mtx_lock_spin(&sched_lock); + TD_SET_CAN_RUN(td2); + setrunqueue(td2, SRQ_BORING); + mtx_unlock_spin(&sched_lock); + return (0); } @@ -476,6 +491,7 @@ { int error; struct proc *p2; + struct thread *td2; #ifdef DEBUG if (ldebug(vfork)) @@ -483,7 +499,7 @@ #endif /* exclude RFPPWAIT */ - if ((error = fork1(td, RFFDG | RFPROC | RFMEM, 0, &p2)) != 0) + if ((error = fork1(td, RFFDG | RFPROC | RFMEM | RFSTOPPED, 0, &p2)) != 0) return (error); if (error == 0) { td->td_retval[0] = p2->p_pid; @@ -495,12 +511,25 @@ error = linux_proc_init(td, td->td_retval[0], 0); if (error) return (error); + + PROC_LOCK(p2); + p2->p_flag |= P_PPWAIT; + PROC_UNLOCK(p2); + + td2 = FIRST_THREAD_IN_PROC(p2); + + /* make it run */ + mtx_lock_spin(&sched_lock); + TD_SET_CAN_RUN(td2); + setrunqueue(td2, SRQ_BORING); + mtx_unlock_spin(&sched_lock); + /* wait for the children to exit, ie. emulate vfork */ PROC_LOCK(p2); - p2->p_flag |= P_PPWAIT; while (p2->p_flag & P_PPWAIT) msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); PROC_UNLOCK(p2); + return (0); } @@ -632,6 +661,11 @@ printf(LMSG("clone: successful rfork to %ld, stack %p sig = %d"), (long)p2->p_pid, args->stack, exit_signal); #endif + if (args->flags & CLONE_VFORK) { + PROC_LOCK(p2); + p2->p_flag |= P_PPWAIT; + PROC_UNLOCK(p2); + } /* * Make this runnable after we are finished with it. @@ -647,7 +681,6 @@ if (args->flags & CLONE_VFORK) { /* wait for the children to exit, ie. emulate vfork */ PROC_LOCK(p2); - p2->p_flag |= P_PPWAIT; while (p2->p_flag & P_PPWAIT) msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); PROC_UNLOCK(p2); ==== //depot/projects/vimage/src/sys/arm/arm/busdma_machdep.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.27 2006/08/25 15:10:45 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.28 2007/01/17 00:53:05 cognet Exp $"); /* * MacPPC bus dma support routines @@ -48,6 +48,7 @@ #include #include #include +#include #include #include @@ -56,7 +57,14 @@ #include #include #include +#include +#define MAX_BPAGES 64 +#define BUS_DMA_COULD_BOUNCE BUS_DMA_BUS3 +#define BUS_DMA_MIN_ALLOC_COMP BUS_DMA_BUS4 + +struct bounce_zone; + struct bus_dma_tag { bus_dma_tag_t parent; bus_size_t alignment; @@ -81,8 +89,47 @@ */ struct arm32_dma_range *ranges; int _nranges; + struct bounce_zone *bounce_zone; }; +struct bounce_page { + vm_offset_t vaddr; /* kva of bounce buffer */ + vm_offset_t vaddr_nocache; /* kva of bounce buffer uncached */ + bus_addr_t busaddr; /* Physical address */ + vm_offset_t datavaddr; /* kva of client data */ + bus_size_t datacount; /* client data count */ + STAILQ_ENTRY(bounce_page) links; +}; + +int busdma_swi_pending; + +struct bounce_zone { + STAILQ_ENTRY(bounce_zone) links; + STAILQ_HEAD(bp_list, bounce_page) bounce_page_list; + int total_bpages; + int free_bpages; + int reserved_bpages; + int active_bpages; + int total_bounced; + int total_deferred; + bus_size_t alignment; + bus_size_t boundary; + bus_addr_t lowaddr; + char zoneid[8]; + char lowaddrid[20]; + struct sysctl_ctx_list sysctl_tree; + struct sysctl_oid *sysctl_tree_top; +}; + +static struct mtx bounce_lock; +static int total_bpages; +static int busdma_zonecount; +static STAILQ_HEAD(, bounce_zone) bounce_zone_list; + +SYSCTL_NODE(_hw, OID_AUTO, busdma, CTLFLAG_RD, 0, "Busdma parameters"); +SYSCTL_INT(_hw_busdma, OID_AUTO, total_bpages, CTLFLAG_RD, &total_bpages, 0, + "Total bounce pages"); + #define DMAMAP_LINEAR 0x1 #define DMAMAP_MBUF 0x2 #define DMAMAP_UIO 0x4 @@ -90,6 +137,9 @@ #define DMAMAP_TYPE_MASK (DMAMAP_LINEAR|DMAMAP_MBUF|DMAMAP_UIO) #define DMAMAP_COHERENT 0x8 struct bus_dmamap { + struct bp_list bpages; + int pagesneeded; + int pagesreserved; bus_dma_tag_t dmat; int flags; void *buffer; @@ -97,8 +147,15 @@ void *allocbuffer; TAILQ_ENTRY(bus_dmamap) freelist; int len; + STAILQ_ENTRY(bus_dmamap) links; + bus_dmamap_callback_t *callback; + void *callback_arg; + }; +static STAILQ_HEAD(, bus_dmamap) bounce_map_waitinglist; +static STAILQ_HEAD(, bus_dmamap) bounce_map_callbacklist; + static TAILQ_HEAD(,bus_dmamap) dmamap_freelist = TAILQ_HEAD_INITIALIZER(dmamap_freelist); @@ -109,6 +166,45 @@ MTX_SYSINIT(busdma_mtx, &busdma_mtx, "busdma lock", MTX_DEF); +static void init_bounce_pages(void *dummy); +static int alloc_bounce_zone(bus_dma_tag_t dmat); +static int alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages); +static int reserve_bounce_pages(bus_dma_tag_t dmat, bus_dmamap_t map, + int commit); +static bus_addr_t add_bounce_page(bus_dma_tag_t dmat, bus_dmamap_t map, + vm_offset_t vaddr, bus_size_t size); +static void free_bounce_page(bus_dma_tag_t dmat, struct bounce_page *bpage); + +/* Default tag, as most drivers provide no parent tag. */ +bus_dma_tag_t arm_root_dma_tag; + +/* + * Return true if a match is made. + * + * To find a match walk the chain of bus_dma_tag_t's looking for 'paddr'. + * + * If paddr is within the bounds of the dma tag then call the filter callback + * to check for a match, if there is no filter callback then assume a match. + */ +static int +run_filter(bus_dma_tag_t dmat, bus_addr_t paddr) +{ + int retval; + + retval = 0; + + do { + if (((paddr > dmat->lowaddr && paddr <= dmat->highaddr) + || ((paddr & (dmat->alignment - 1)) != 0)) + && (dmat->filter == NULL + || (*dmat->filter)(dmat->filterarg, paddr) != 0)) + retval = 1; + + dmat = dmat->parent; + } while (retval == 0 && dmat != NULL); + return (retval); +} + static void arm_dmamap_freelist_init(void *dummy) { @@ -129,6 +225,19 @@ bus_dmamap_t map, void *buf, bus_size_t buflen, struct pmap *pmap, int flags, vm_offset_t *lastaddrp, int *segp); +static __inline int +_bus_dma_can_bounce(vm_offset_t lowaddr, vm_offset_t highaddr) +{ + int i; + for (i = 0; phys_avail[i] && phys_avail[i + 1]; i += 2) { + if ((lowaddr >= phys_avail[i] && lowaddr <= phys_avail[i + 1]) + || (lowaddr < phys_avail[i] && + highaddr > phys_avail[i])) + return (1); + } + return (0); +} + static __inline struct arm32_dma_range * _bus_dma_inrange(struct arm32_dma_range *ranges, int nranges, bus_addr_t curaddr) @@ -195,11 +304,12 @@ TAILQ_REMOVE(&dmamap_freelist, map, freelist); mtx_unlock(&busdma_mtx); if (!map) { - map = malloc(sizeof(*map), M_DEVBUF, M_NOWAIT); + map = malloc(sizeof(*map), M_DEVBUF, M_NOWAIT | M_ZERO); if (map) map->flags = DMAMAP_ALLOCATED; } else map->flags = 0; + STAILQ_INIT(&map->bpages); return (map); } @@ -232,6 +342,8 @@ int error = 0; /* Return a NULL tag on failure */ *dmat = NULL; + if (!parent) + parent = arm_root_dma_tag; newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_DEVBUF, M_NOWAIT); if (newtag == NULL) { @@ -273,6 +385,9 @@ else if (parent->boundary != 0) newtag->boundary = min(parent->boundary, newtag->boundary); + if ((newtag->filter != NULL) || + ((parent->flags & BUS_DMA_COULD_BOUNCE) != 0)) + newtag->flags |= BUS_DMA_COULD_BOUNCE; if (newtag->filter == NULL) { /* * Short circuit looking at our parent directly @@ -285,8 +400,38 @@ if (newtag->parent != NULL) atomic_add_int(&parent->ref_count, 1); } + if (_bus_dma_can_bounce(newtag->lowaddr, newtag->highaddr) + || newtag->alignment > 1) + newtag->flags |= BUS_DMA_COULD_BOUNCE; + + if (((newtag->flags & BUS_DMA_COULD_BOUNCE) != 0) && + (flags & BUS_DMA_ALLOCNOW) != 0) { + struct bounce_zone *bz; + + /* Must bounce */ + + if ((error = alloc_bounce_zone(newtag)) != 0) { + free(newtag, M_DEVBUF); + return (error); + } + bz = newtag->bounce_zone; - *dmat = newtag; + if (ptoa(bz->total_bpages) < maxsize) { + int pages; + + pages = atop(maxsize) - bz->total_bpages; + + /* Add pages to our bounce pool */ + if (alloc_bounce_pages(newtag, pages) < pages) + error = ENOMEM; + } + /* Performed initial allocation */ + newtag->flags |= BUS_DMA_MIN_ALLOC_COMP; + } + if (error != 0) + free(newtag, M_DEVBUF); + else + *dmat = newtag; CTR4(KTR_BUSDMA, "%s returned tag %p tag flags 0x%x error %d", __func__, newtag, (newtag != NULL ? newtag->flags : 0), error); @@ -327,6 +472,7 @@ return (0); } +#include /* * Allocate a handle for mapping from kva/uva/physical * address space into bus device space. @@ -335,9 +481,7 @@ bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp) { bus_dmamap_t newmap; -#ifdef KTR int error = 0; -#endif newmap = _busdma_alloc_dmamap(); if (newmap == NULL) { @@ -349,6 +493,52 @@ newmap->allocbuffer = NULL; dmat->map_count++; + /* + * Bouncing might be required if the driver asks for an active + * exclusion region, a data alignment that is stricter than 1, and/or + * an active address boundary. + */ + if (dmat->flags & BUS_DMA_COULD_BOUNCE) { + + /* Must bounce */ + struct bounce_zone *bz; + int maxpages; + + if (dmat->bounce_zone == NULL) { + if ((error = alloc_bounce_zone(dmat)) != 0) { + _busdma_free_dmamap(newmap); + *mapp = NULL; + return (error); + } + } + bz = dmat->bounce_zone; + + /* Initialize the new map */ + STAILQ_INIT(&((*mapp)->bpages)); + + /* + * Attempt to add pages to our pool on a per-instance + * basis up to a sane limit. + */ + maxpages = MAX_BPAGES; + if ((dmat->flags & BUS_DMA_MIN_ALLOC_COMP) == 0 + || (dmat->map_count > 0 && bz->total_bpages < maxpages)) { + int pages; + + pages = MAX(atop(dmat->maxsize), 1); + pages = MIN(maxpages - bz->total_bpages, pages); + pages = MAX(pages, 1); + if (alloc_bounce_pages(dmat, pages) < pages) + error = ENOMEM; + + if ((dmat->flags & BUS_DMA_MIN_ALLOC_COMP) == 0) { + if (error == 0) + dmat->flags |= BUS_DMA_MIN_ALLOC_COMP; + } else { + error = 0; + } + } + } CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", __func__, dmat, dmat->flags, error); @@ -364,6 +554,11 @@ { _busdma_free_dmamap(map); + if (STAILQ_FIRST(&map->bpages) != NULL) { + CTR3(KTR_BUSDMA, "%s: tag %p error %d", + __func__, dmat, EBUSY); + return (EBUSY); + } dmat->map_count--; CTR2(KTR_BUSDMA, "%s: tag %p error 0", __func__, dmat); return (0); @@ -399,7 +594,9 @@ *mapp = newmap; newmap->dmat = dmat; - if (dmat->maxsize <= PAGE_SIZE) { + if (dmat->maxsize <= PAGE_SIZE && + (dmat->alignment < dmat->maxsize) && + !_bus_dma_can_bounce(dmat->lowaddr, dmat->highaddr)) { *vaddr = malloc(dmat->maxsize, M_DEVBUF, mflags); } else { /* @@ -452,7 +649,9 @@ vaddr = map->origbuffer; arm_unmap_nocache(map->allocbuffer, dmat->maxsize); } - if (dmat->maxsize <= PAGE_SIZE) + if (dmat->maxsize <= PAGE_SIZE && + dmat->alignment < dmat->maxsize && + !_bus_dma_can_bounce(dmat->lowaddr, dmat->highaddr)) free(vaddr, M_DEVBUF); else { contigfree(vaddr, dmat->maxsize, M_DEVBUF); @@ -462,6 +661,64 @@ CTR3(KTR_BUSDMA, "%s: tag %p flags 0x%x", __func__, dmat, dmat->flags); } +static int +_bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, + bus_size_t buflen, int flags, int *nb) +{ + vm_offset_t vaddr; + vm_offset_t vendaddr; + bus_addr_t paddr; + int needbounce = *nb; + + if ((map->pagesneeded == 0)) { + CTR4(KTR_BUSDMA, "lowaddr= %d Maxmem= %d, boundary= %d, " + "alignment= %d", dmat->lowaddr, ptoa((vm_paddr_t)Maxmem), + dmat->boundary, dmat->alignment); + CTR3(KTR_BUSDMA, "map= %p, nobouncemap= %p, pagesneeded= %d", + map, &nobounce_dmamap, map->pagesneeded); + /* + * Count the number of bounce pages + * needed in order to complete this transfer + */ + vaddr = trunc_page((vm_offset_t)buf); + vendaddr = (vm_offset_t)buf + buflen; + + while (vaddr < vendaddr) { + paddr = pmap_kextract(vaddr); + if (((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) && + run_filter(dmat, paddr) != 0) { + needbounce = 1; + map->pagesneeded++; + } + vaddr += PAGE_SIZE; + } + CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded); + } + + /* Reserve Necessary Bounce Pages */ + if (map->pagesneeded != 0) { + mtx_lock(&bounce_lock); + if (flags & BUS_DMA_NOWAIT) { + if (reserve_bounce_pages(dmat, map, 0) != 0) { + mtx_unlock(&bounce_lock); + return (ENOMEM); + } + } else { + if (reserve_bounce_pages(dmat, map, 1) != 0) { + /* Queue us for resources */ + STAILQ_INSERT_TAIL(&bounce_map_waitinglist, + map, links); + mtx_unlock(&bounce_lock); + return (EINPROGRESS); + } + } + mtx_unlock(&bounce_lock); + } + + *nb = needbounce; + return (0); +} + /* * Utility function to load a linear buffer. lastaddrp holds state * between invocations (for multiple-buffer loads). segp contains @@ -481,10 +738,17 @@ pd_entry_t *pde; pt_entry_t pte; pt_entry_t *ptep; + int needbounce = 0; lastaddr = *lastaddrp; bmask = ~(dmat->boundary - 1); + if ((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) { + error = _bus_dmamap_count_pages(dmat, map, buf, buflen, flags, + &needbounce); + if (error) + return (error); + } CTR3(KTR_BUSDMA, "lowaddr= %d boundary= %d, " "alignment= %d", dmat->lowaddr, dmat->boundary, dmat->alignment); @@ -531,20 +795,6 @@ map->flags &= ~DMAMAP_COHERENT; } - if (dmat->ranges) { - struct arm32_dma_range *dr; - - dr = _bus_dma_inrange(dmat->ranges, dmat->_nranges, - curaddr); - if (dr == NULL) - return (EINVAL); - /* - * In a valid DMA range. Translate the physical - * memory address to an address in the DMA window. - */ - curaddr = (curaddr - dr->dr_sysbase) + dr->dr_busbase; - - } /* * Compute the segment size, and adjust counts. */ @@ -560,12 +810,30 @@ if (sgsize > (baddr - curaddr)) sgsize = (baddr - curaddr); } + if (((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) && + map->pagesneeded != 0 && run_filter(dmat, curaddr)) + curaddr = add_bounce_page(dmat, map, vaddr, sgsize); + + if (dmat->ranges) { + struct arm32_dma_range *dr; + dr = _bus_dma_inrange(dmat->ranges, dmat->_nranges, + curaddr); + if (dr == NULL) + return (EINVAL); + /* + * In a valid DMA range. Translate the physical + * memory address to an address in the DMA window. + */ + curaddr = (curaddr - dr->dr_sysbase) + dr->dr_busbase; + + } + /* * Insert chunk into a segment, coalescing with * the previous segment if possible. */ - if (seg >= 0 && curaddr == lastaddr && + if (needbounce == 0 && seg >= 0 && curaddr == lastaddr && (segs[seg].ds_len + sgsize) <= dmat->maxsegsz && (dmat->boundary == 0 || (segs[seg].ds_addr & bmask) == @@ -615,6 +883,8 @@ KASSERT(dmat != NULL, ("dmatag is NULL")); KASSERT(map != NULL, ("dmamap is NULL")); + map->callback = callback; + map->callback_arg = callback_arg; map->flags &= ~DMAMAP_TYPE_MASK; map->flags |= DMAMAP_LINEAR|DMAMAP_COHERENT; map->buffer = buf; @@ -622,6 +892,8 @@ error = bus_dmamap_load_buffer(dmat, dm_segments, map, buf, buflen, kernel_pmap, flags, &lastaddr, &nsegs); + if (error == EINPROGRESS) + return (error); if (error) (*callback)(callback_arg, NULL, 0, error); else @@ -797,26 +1069,93 @@ void _bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map) { + struct bounce_page *bpage; + map->flags &= ~DMAMAP_TYPE_MASK; + while ((bpage = STAILQ_FIRST(&map->bpages)) != NULL) { + STAILQ_REMOVE_HEAD(&map->bpages, links); + free_bounce_page(dmat, bpage); + } return; } static __inline void bus_dmamap_sync_buf(void *buf, int len, bus_dmasync_op_t op) { + char _tmp_cl[arm_dcache_align], _tmp_clend[arm_dcache_align]; if (op & BUS_DMASYNC_PREWRITE) cpu_dcache_wb_range((vm_offset_t)buf, len); - if (op & BUS_DMASYNC_PREREAD) { + if (op & BUS_DMASYNC_POSTREAD) { + if ((vm_offset_t)buf & arm_dcache_align_mask) + memcpy(_tmp_cl, (void *)((vm_offset_t)buf & ~ + arm_dcache_align_mask), + (vm_offset_t)buf - ((vm_offset_t)buf &~ + arm_dcache_align_mask)); + if (((vm_offset_t)buf + len) & arm_dcache_align_mask) + memcpy(_tmp_cl, (void *)((vm_offset_t)buf & ~ + arm_dcache_align_mask), + (vm_offset_t)buf - ((vm_offset_t)buf &~ + arm_dcache_align_mask)); + if (((vm_offset_t)buf + len) & arm_dcache_align_mask) + memcpy(_tmp_clend, (void *)(((vm_offset_t)buf + len) & ~ + arm_dcache_align_mask), + (vm_offset_t)buf +len - (((vm_offset_t)buf + len) &~ + arm_dcache_align_mask)); + cpu_dcache_inv_range((vm_offset_t)buf, len); if ((vm_offset_t)buf & arm_dcache_align_mask) - cpu_dcache_wbinv_range((vm_offset_t)buf & - ~arm_dcache_align_mask, arm_dcache_align); + memcpy((void *)((vm_offset_t)buf & + ~arm_dcache_align_mask), + _tmp_cl, + (vm_offset_t)buf - ((vm_offset_t)buf &~ + arm_dcache_align_mask)); if (((vm_offset_t)buf + len) & arm_dcache_align_mask) - cpu_dcache_wbinv_range(((vm_offset_t)buf + len) & - ~arm_dcache_align_mask, arm_dcache_align); + memcpy((void *)(((vm_offset_t)buf + len) & ~ + arm_dcache_align_mask), _tmp_clend, + (vm_offset_t)buf +len - (((vm_offset_t)buf + len) &~ + arm_dcache_align_mask)); + } +} + +static void +_bus_dmamap_sync_bp(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op) +{ + struct bounce_page *bpage; + + STAILQ_FOREACH(bpage, &map->bpages, links) { + if (op & BUS_DMASYNC_PREWRITE) { + bcopy((void *)bpage->datavaddr, + (void *)(bpage->vaddr_nocache != 0 ? + bpage->vaddr_nocache : bpage->vaddr), + bpage->datacount); + if (bpage->vaddr_nocache == 0) + cpu_dcache_wb_range(bpage->vaddr, + bpage->datacount); + } + if (op & BUS_DMASYNC_POSTREAD) { + if (bpage->vaddr_nocache == 0) + cpu_dcache_inv_range(bpage->vaddr, + bpage->datacount); + bcopy((void *)(bpage->vaddr_nocache != 0 ? + bpage->vaddr_nocache : bpage->vaddr), + (void *)bpage->datavaddr, bpage->datacount); + } + } +} + +static __inline int +_bus_dma_buf_is_in_bp(bus_dmamap_t map, void *buf, int len) +{ + struct bounce_page *bpage; + + STAILQ_FOREACH(bpage, &map->bpages, links) { + if ((vm_offset_t)buf >= bpage->datavaddr && + (vm_offset_t)buf + len < bpage->datavaddr + + bpage->datacount) + return (1); } - if (op & BUS_DMASYNC_POSTREAD) - cpu_dcache_inv_range((vm_offset_t)buf, len); + return (0); + } void @@ -829,6 +1168,8 @@ if (op == BUS_DMASYNC_POSTWRITE) return; + if (STAILQ_FIRST(&map->bpages)) + _bus_dmamap_sync_bp(dmat, map, op); if (map->flags & DMAMAP_COHERENT) return; if ((op && BUS_DMASYNC_POSTREAD) && (map->len >= 2 * PAGE_SIZE)) { @@ -838,12 +1179,14 @@ CTR3(KTR_BUSDMA, "%s: op %x flags %x", __func__, op, map->flags); switch(map->flags & DMAMAP_TYPE_MASK) { case DMAMAP_LINEAR: - bus_dmamap_sync_buf(map->buffer, map->len, op); + if (!(_bus_dma_buf_is_in_bp(map, map->buffer, map->len))) + bus_dmamap_sync_buf(map->buffer, map->len, op); break; case DMAMAP_MBUF: m = map->buffer; while (m) { - if (m->m_len > 0) + if (m->m_len > 0 && + !(_bus_dma_buf_is_in_bp(map, m->m_data, m->m_len))) bus_dmamap_sync_buf(m->m_data, m->m_len, op); m = m->m_next; } @@ -856,8 +1199,10 @@ bus_size_t minlen = resid < iov[i].iov_len ? resid : iov[i].iov_len; if (minlen > 0) { - bus_dmamap_sync_buf(iov[i].iov_base, minlen, - op); + if (!_bus_dma_buf_is_in_bp(map, iov[i].iov_base, + minlen)) + bus_dmamap_sync_buf(iov[i].iov_base, + minlen, op); resid -= minlen; } } @@ -867,3 +1212,247 @@ } cpu_drain_writebuf(); } + +static void +init_bounce_pages(void *dummy __unused) +{ + + total_bpages = 0; + STAILQ_INIT(&bounce_zone_list); + STAILQ_INIT(&bounce_map_waitinglist); + STAILQ_INIT(&bounce_map_callbacklist); + mtx_init(&bounce_lock, "bounce pages lock", NULL, MTX_DEF); +} +SYSINIT(bpages, SI_SUB_LOCK, SI_ORDER_ANY, init_bounce_pages, NULL); + +static struct sysctl_ctx_list * +busdma_sysctl_tree(struct bounce_zone *bz) +{ + return (&bz->sysctl_tree); +} + +static struct sysctl_oid * +busdma_sysctl_tree_top(struct bounce_zone *bz) +{ + return (bz->sysctl_tree_top); +} + +static int +alloc_bounce_zone(bus_dma_tag_t dmat) +{ + struct bounce_zone *bz; + + /* Check to see if we already have a suitable zone */ + STAILQ_FOREACH(bz, &bounce_zone_list, links) { + if ((dmat->alignment <= bz->alignment) + && (dmat->boundary <= bz->boundary) + && (dmat->lowaddr >= bz->lowaddr)) { + dmat->bounce_zone = bz; + return (0); + } + } + + if ((bz = (struct bounce_zone *)malloc(sizeof(*bz), M_DEVBUF, + M_NOWAIT | M_ZERO)) == NULL) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jan 22 15:04:07 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B860816A40D; Mon, 22 Jan 2007 15:04:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7276C16A403 for ; Mon, 22 Jan 2007 15:04:07 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6153C13C45B for ; Mon, 22 Jan 2007 15:04:07 +0000 (UTC) (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 l0MF47s0001866 for ; Mon, 22 Jan 2007 15:04:07 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MF47Vm001862 for perforce@freebsd.org; Mon, 22 Jan 2007 15:04:07 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:04:07 GMT Message-Id: <200701221504.l0MF47Vm001862@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 113313 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 15:04:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=113313 Change 113313 by millert@millert_macbook on 2007/01/22 15:03:09 We only need one recycle function. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#55 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#55 (text+ko) ==== @@ -561,14 +561,14 @@ } static void -sebsd_vnode_label_recycle(struct label *label) +sebsd_label_recycle(struct label *label) { - struct vnode_security_struct *vsec; + struct sebsd_label *lsec; - vsec = SLOT(label); - vsec->sid = SECINITSID_UNLABELED; - vsec->task_sid = SECINITSID_UNLABELED; - vsec->sclass = 0; + lsec = SLOT(label); + lsec->sid = SECINITSID_UNLABELED; + lsec->task_sid = SECINITSID_UNLABELED; + lsec->sclass = 0; } static void @@ -584,16 +584,6 @@ } static void -sebsd_sysv_label_recycle(struct label *label) -{ - struct ipc_security_struct *ipcsec; - - ipcsec = SLOT(label); - bzero(ipcsec, sizeof(struct ipc_security_struct)); - ipcsec->sid = SECINITSID_UNLABELED; -} - -static void sebsd_vnode_label_associate_devfs(struct mount *mp, struct label *mntlabel, struct devnode *de, struct label *delabel, struct vnode *vp, struct label *vlabel) @@ -3509,7 +3499,7 @@ .mpo_sysvmsg_label_associate = sebsd_sysvmsg_label_associate, .mpo_sysvmsg_label_destroy = sebsd_label_destroy, .mpo_sysvmsg_label_init = sebsd_label_init, - .mpo_sysvmsg_label_recycle = sebsd_sysv_label_recycle, + .mpo_sysvmsg_label_recycle = sebsd_label_recycle, .mpo_sysvmsq_check_enqueue = sebsd_sysvmsq_check_enqueue, .mpo_sysvmsq_check_msgrcv = sebsd_sysvmsq_check_msgrcv, .mpo_sysvmsq_check_msqctl = sebsd_sysvmsq_check_msqctl, @@ -3519,21 +3509,21 @@ .mpo_sysvmsq_label_associate = sebsd_sysvmsq_label_associate, .mpo_sysvmsq_label_destroy = sebsd_label_destroy, .mpo_sysvmsq_label_init = sebsd_label_init, - .mpo_sysvmsq_label_recycle = sebsd_sysv_label_recycle, + .mpo_sysvmsq_label_recycle = sebsd_label_recycle, .mpo_sysvsem_check_semctl = sebsd_sysvsem_check_semctl, .mpo_sysvsem_check_semget = sebsd_sysvsem_check_semget, .mpo_sysvsem_check_semop = sebsd_sysvsem_check_semop, .mpo_sysvsem_label_associate = sebsd_sysvsem_label_associate, .mpo_sysvsem_label_destroy = sebsd_label_destroy, .mpo_sysvsem_label_init = sebsd_label_init, - .mpo_sysvsem_label_recycle = sebsd_sysv_label_recycle, + .mpo_sysvsem_label_recycle = sebsd_label_recycle, .mpo_sysvshm_check_shmat = sebsd_sysvshm_check_shmat, .mpo_sysvshm_check_shmctl = sebsd_sysvshm_check_shmctl, .mpo_sysvshm_check_shmget = sebsd_sysvshm_check_shmget, .mpo_sysvshm_label_associate = sebsd_sysvshm_label_associate, .mpo_sysvshm_label_destroy = sebsd_label_destroy, .mpo_sysvshm_label_init = sebsd_label_init, - .mpo_sysvshm_label_recycle = sebsd_sysv_label_recycle, + .mpo_sysvshm_label_recycle = sebsd_label_recycle, .mpo_task_check_get_port = sebsd_task_check_get_port, .mpo_task_label_associate = sebsd_task_create, .mpo_task_label_associate_kernel = sebsd_task_create_kernel, @@ -3587,7 +3577,7 @@ .mpo_vnode_label_externalize_audit = sebsd_label_externalize, .mpo_vnode_label_init = sebsd_label_init, .mpo_vnode_label_internalize = sebsd_label_internalize, - .mpo_vnode_label_recycle = sebsd_vnode_label_recycle, + .mpo_vnode_label_recycle = sebsd_label_recycle, .mpo_vnode_label_store = sebsd_vnode_label_store, .mpo_vnode_label_update = sebsd_vnode_label_update, .mpo_vnode_label_update_extattr = sebsd_vnode_label_update_extattr, From owner-p4-projects@FreeBSD.ORG Mon Jan 22 15:04:08 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4048516A56D; Mon, 22 Jan 2007 15:04:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0450416A507 for ; Mon, 22 Jan 2007 15:04:07 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CC58913C441 for ; Mon, 22 Jan 2007 15:04:07 +0000 (UTC) (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 l0MF47fk001875 for ; Mon, 22 Jan 2007 15:04:07 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MF47Qe001869 for perforce@freebsd.org; Mon, 22 Jan 2007 15:04:07 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:04:07 GMT Message-Id: <200701221504.l0MF47Qe001869@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 113314 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 15:04:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=113314 Change 113314 by millert@millert_macbook on 2007/01/22 15:03:29 Rename copy_network_label() to network_label_copy(). Replace sebsd_vnode_label_copy(), sebsd_task_label_copy() and sebsd_port_label_update_cred() with sebsd_label_copy(). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#56 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#56 (text+ko) ==== @@ -154,7 +154,7 @@ } static void -copy_network_label(struct label *slabel, struct label *dlabel) +network_label_copy(struct label *slabel, struct label *dlabel) { struct network_security_struct *src, *dst; @@ -166,7 +166,7 @@ if (src == NULL || dst == NULL) return; - memcpy(dst, src, sizeof(struct network_security_struct)); + *dst = *src; } /* @@ -914,7 +914,7 @@ struct mbuf *m, struct label *mlabel) { - copy_network_label(blabel, mlabel); + network_label_copy(blabel, mlabel); } static void @@ -922,7 +922,7 @@ struct mbuf *m, struct label *mlabel) { - copy_network_label(ilabel, mlabel); + network_label_copy(ilabel, mlabel); } #endif @@ -1119,7 +1119,7 @@ struct mbuf *m, struct label *mlabel) { - copy_network_label(solabel, mlabel); + network_label_copy(solabel, mlabel); } static void @@ -1180,7 +1180,7 @@ struct xsocket *news, struct label *newslabel) { - copy_network_label(oldslabel, newslabel); + network_label_copy(oldslabel, newslabel); } static int @@ -1791,7 +1791,7 @@ struct label *oldlabel, struct label *newlabel) { - copy_network_label(oldlabel, newlabel); + network_label_copy(oldlabel, newlabel); } static void @@ -1832,7 +1832,7 @@ struct xsocket *xso, struct label *sopeerlabel) { - copy_network_label(mlabel, sopeerlabel); + network_label_copy(mlabel, sopeerlabel); } static void @@ -1840,7 +1840,7 @@ struct xsocket *news, struct label *newsockpeerlabel) { - copy_network_label(oldslabel, newsockpeerlabel); + network_label_copy(oldslabel, newsockpeerlabel); } static int @@ -2878,37 +2878,12 @@ } static void -sebsd_vnode_label_copy(struct label *src, struct label *dest) +sebsd_label_copy(struct label *src, struct label *dest) { - *(struct vnode_security_struct *)SLOT(dest) = - *(struct vnode_security_struct *)SLOT(src); + *(struct sebsd_label *)SLOT(dest) = *(struct sebsd_label *)SLOT(src); } -#if 0 -static void -sebsd_copy_mount_label(struct label *src, struct label *dest) -{ - - *(struct mount_security_struct *)SLOT(dest) = - *(struct mount_security_struct *)SLOT(src); -} -#endif - -static void -sebsd_task_label_copy(struct label *src, struct label *dest) -{ - *(struct task_security_struct *)SLOT(dest) = - *(struct task_security_struct *)SLOT(src); -} - -static void -sebsd_port_label_update_cred(struct label *src, struct label *dest) -{ - *(struct task_security_struct *)SLOT(dest) = - *(struct task_security_struct *)SLOT(src); -} - #ifdef FD__CREATE static int sebsd_file_check_create(struct ucred *cred) @@ -3369,7 +3344,7 @@ .mpo_cred_label_update_execve = sebsd_cred_label_update_execve, .mpo_devfs_label_associate_device = sebsd_devfs_label_associate_device, .mpo_devfs_label_associate_directory = sebsd_devfs_label_associate_directory, - .mpo_devfs_label_copy = sebsd_vnode_label_copy, + .mpo_devfs_label_copy = sebsd_label_copy, .mpo_devfs_label_destroy = sebsd_label_destroy, .mpo_devfs_label_init = sebsd_label_init, .mpo_devfs_label_update = sebsd_devfs_update, @@ -3386,7 +3361,7 @@ .mpo_file_label_destroy = sebsd_label_destroy, .mpo_file_label_init = sebsd_label_init, .mpo_mbuf_label_associate_socket = sebsd_mbuf_label_associate_socket, - .mpo_mbuf_label_copy = copy_network_label, + .mpo_mbuf_label_copy = network_label_copy, .mpo_mbuf_label_destroy = sebsd_label_destroy, .mpo_mbuf_label_init = sebsd_label_init2, .mpo_mount_check_getattr = sebsd_mount_check_getattr, @@ -3409,7 +3384,7 @@ .mpo_pipe_check_stat = sebsd_pipe_check_stat, .mpo_pipe_check_write = sebsd_pipe_check_write, .mpo_pipe_label_associate = sebsd_pipe_label_associate, - .mpo_pipe_label_copy = sebsd_vnode_label_copy, + .mpo_pipe_label_copy = sebsd_label_copy, .mpo_pipe_label_destroy = sebsd_label_destroy, .mpo_pipe_label_externalize = sebsd_label_externalize, .mpo_pipe_label_init = sebsd_label_init, @@ -3436,10 +3411,10 @@ .mpo_port_label_associate = sebsd_port_create, .mpo_port_label_associate_kernel = sebsd_port_label_associate_kernel, .mpo_port_label_compute = sebsd_request_label, - .mpo_port_label_copy = sebsd_task_label_copy, + .mpo_port_label_copy = sebsd_label_copy, .mpo_port_label_destroy = sebsd_label_destroy, .mpo_port_label_init = sebsd_label_init, - .mpo_port_label_update_cred = sebsd_port_label_update_cred, + .mpo_port_label_update_cred = sebsd_label_copy, .mpo_posixsem_check_create = sebsd_posixsem_check_create, .mpo_posixsem_check_open = sebsd_posixsem_check_open, .mpo_posixsem_check_post = sebsd_posixsem_check_post, @@ -3476,7 +3451,7 @@ .mpo_socket_check_stat = sebsd_socket_check_stat, .mpo_socket_label_associate = sebsd_socket_label_associate, .mpo_socket_label_associate_accept = sebsd_socket_label_associate_accept, - .mpo_socket_label_copy = copy_network_label, + .mpo_socket_label_copy = network_label_copy, .mpo_socket_label_destroy = sebsd_label_destroy, .mpo_socket_label_externalize = sebsd_label_externalize, .mpo_socket_label_init = sebsd_label_init2, @@ -3527,7 +3502,7 @@ .mpo_task_check_get_port = sebsd_task_check_get_port, .mpo_task_label_associate = sebsd_task_create, .mpo_task_label_associate_kernel = sebsd_task_create_kernel, - .mpo_task_label_copy = sebsd_task_label_copy, + .mpo_task_label_copy = sebsd_label_copy, .mpo_task_label_destroy = sebsd_label_destroy, .mpo_task_label_externalize = sebsd_label_externalize, .mpo_task_label_init = sebsd_label_init, @@ -3571,7 +3546,7 @@ .mpo_vnode_label_associate_posixshm = sebsd_vnode_label_associate_posixshm, .mpo_vnode_label_associate_singlelabel = sebsd_vnode_label_associate_singlelabel, .mpo_vnode_label_associate_socket = sebsd_vnode_label_associate_socket, - .mpo_vnode_label_copy = sebsd_vnode_label_copy, + .mpo_vnode_label_copy = sebsd_label_copy, .mpo_vnode_label_destroy = sebsd_label_destroy, .mpo_vnode_label_externalize = sebsd_label_externalize, .mpo_vnode_label_externalize_audit = sebsd_label_externalize, From owner-p4-projects@FreeBSD.ORG Mon Jan 22 15:11:20 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 894FD16A405; Mon, 22 Jan 2007 15:11:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 468C216A400 for ; Mon, 22 Jan 2007 15:11:20 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2A05413C455 for ; Mon, 22 Jan 2007 15:11:20 +0000 (UTC) (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 l0MFBKir002926 for ; Mon, 22 Jan 2007 15:11:20 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFBJnQ002917 for perforce@freebsd.org; Mon, 22 Jan 2007 15:11:19 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:11:19 GMT Message-Id: <200701221511.l0MFBJnQ002917@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 113318 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 15:11:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=113318 Change 113318 by millert@millert_macbook on 2007/01/22 15:10:21 Set sclass for all label types. For socket labels this means we no longer need to re-compute the sclass post-associate. Also add some XXX for potential issues. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#57 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_labels.h#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#57 (text+ko) ==== @@ -185,6 +185,7 @@ if (!kau_will_audit()) return; + /* XXX - malloc could sleep */ if (sbuf_new(&sb, NULL, 0, SBUF_AUTOEXTEND) == NULL) { printf("%s: failed to allocate an sbuf for auditing\n", __func__); @@ -612,8 +613,7 @@ vsec->sid = nsec->sid; vsec->task_sid = tsec->sid; - vsec->sclass = socket_type_to_security_class(xso->xso_family, - xso->so_type, xso->xso_protocol); + vsec->sclass = nsec->sclass; } static void @@ -862,6 +862,7 @@ /* Default to using the attributes from the parent process */ task->osid = parent->osid; task->sid = parent->sid; + task->sclass = parent->sclass; } static void @@ -875,6 +876,7 @@ fsec = SLOT(label); fsec->sid = tsec->sid; + fsec->sclass = SECCLASS_FD; } static void @@ -905,6 +907,7 @@ psec = SLOT(port); psec->sid = SECINITSID_KERNEL; + psec->sclass = SECCLASS_MACH_PORT; } /* XXX - the Darwin framework lacks ifnet and bpf labels */ @@ -1039,6 +1042,7 @@ dirent->sclass = devfs_type_to_security_class(devfs_dirent->dn_type); /* Obtain a SID based on the fstype, path, and class. */ + /* XXX - malloc could sleep */ path = sebsd_malloc(strlen(fullpath) + 2, M_SEBSD, M_ZERO | M_WAITOK); path[0] = '/'; strcpy(&path[1], fullpath); @@ -1071,6 +1075,7 @@ dirent->sclass = devfs_type_to_security_class(de->dn_type); /* Obtain a SID based on the fstype, path, and class. */ + /* XXX - malloc could sleep */ path = sebsd_malloc(strlen(fullpath) + 2, M_SEBSD, M_ZERO | M_WAITOK); path[0] = '/'; strcpy(&path[1], fullpath); @@ -1112,6 +1117,7 @@ task = SLOT(cred->cr_label); task->osid = task->sid = SECINITSID_KERNEL; + task->sclass = SECCLASS_PROCESS; } static void @@ -1161,6 +1167,7 @@ break; } sbsec->behavior = behavior; /* note: behavior 16 bits in sbsec */ + sbsec->sclass = SECCLASS_FILESYSTEM; } static void @@ -1173,6 +1180,8 @@ tsec = SLOT(cred->cr_label); nsec = SLOT(solabel); nsec->sid = nsec->task_sid = tsec->sid; + nsec->sclass = socket_type_to_security_class(xso->xso_family, + xso->so_type, xso->xso_protocol); } static void @@ -2463,7 +2472,6 @@ struct sockaddr_in *sin; struct sockaddr_in6 *sin6; in_port_t port; - u_int16_t sclass; u_int32_t sid, node_perm; int error; @@ -2490,9 +2498,6 @@ port = ntohs(sin6->sin6_port); } - sclass = socket_type_to_security_class(xso->xso_family, xso->so_type, - xso->xso_protocol); - if (port) { /* XXX - check against net.inet.ip.portrange.last? */ error = security_port_sid(xso->xso_family, xso->so_type, @@ -2502,13 +2507,13 @@ AVC_AUDIT_DATA_INIT(&ad, NET); ad.u.net.sport = htons(port); ad.u.net.family = xso->xso_family; - error = avc_has_perm(nsec->sid, sid, sclass, + error = avc_has_perm(nsec->sid, sid, nsec->sclass, SOCKET__NAME_BIND, &ad); if (error) return (error); } - switch (sclass) { + switch (nsec->sclass) { case SECCLASS_TCP_SOCKET: node_perm = TCP_SOCKET__NODE_BIND; break; @@ -2533,7 +2538,7 @@ bcopy(&ad.u.net.v6info.saddr, &sin6->sin6_addr, sizeof(ad.u.net.v6info.saddr)); - error = avc_has_perm(nsec->sid, sid, sclass, node_perm, &ad); + error = avc_has_perm(nsec->sid, sid, nsec->sclass, node_perm, &ad); return (error); } @@ -2547,7 +2552,6 @@ struct sockaddr_in *sin; struct sockaddr_in6 *sin6; in_port_t port; - u_int16_t sclass; u_int32_t sid; int error; @@ -2555,12 +2559,8 @@ if (error) return (error); - sclass = socket_type_to_security_class(xso->xso_family, xso->so_type, - xso->xso_protocol); - - if (sclass == SECCLASS_TCP_SOCKET) { - nsec = SLOT(socklabel); - + nsec = SLOT(socklabel); + if (nsec->sclass == SECCLASS_TCP_SOCKET) { if (xso->xso_family == AF_INET) { sin = (struct sockaddr_in *)addr; port = ntohs(sin->sin_port); @@ -2577,7 +2577,7 @@ AVC_AUDIT_DATA_INIT(&ad, NET); ad.u.net.dport = htons(port); ad.u.net.family = xso->xso_family; - error = avc_has_perm(nsec->sid, sid, sclass, + error = avc_has_perm(nsec->sid, sid, nsec->sclass, TCP_SOCKET__NAME_CONNECT, &ad); } ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_labels.h#6 (text+ko) ==== @@ -44,10 +44,10 @@ struct sebsd_label { u_int32_t osid; /* task_sid for all but task_security_struct */ u_int32_t sid; - u_int16_t sclass; /* only used for vnode and ipc */ + u_int16_t sclass; u_int16_t behavior; /* only used for mount */ }; -#define task_sid osid +#define task_sid osid /* XXX - need to be separate if polymorphic */ #define task_security_struct sebsd_label #define file_security_struct sebsd_label From owner-p4-projects@FreeBSD.ORG Mon Jan 22 15:11:20 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C035F16A50F; Mon, 22 Jan 2007 15:11:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9A18916A468 for ; Mon, 22 Jan 2007 15:11:20 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7E84613C468 for ; Mon, 22 Jan 2007 15:11:20 +0000 (UTC) (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 l0MFBKLU002938 for ; Mon, 22 Jan 2007 15:11:20 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFBKl4002932 for perforce@freebsd.org; Mon, 22 Jan 2007 15:11:20 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:11:20 GMT Message-Id: <200701221511.l0MFBKl4002932@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 113319 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 15:11:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=113319 Change 113319 by millert@millert_macbook on 2007/01/22 15:10:57 - Add entry points for vnode_check_{list, delete}extattr - Add a comment to vnode_check_set, it doesn't look complete Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#58 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#58 (text+ko) ==== @@ -2086,6 +2086,34 @@ return (vnode_has_perm(cred, vp, NULL, FILE__GETATTR)); } +static int +sebsd_vnode_check_listextattr(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + + return (vnode_has_perm(cred, vp, NULL, FILE__GETATTR)); +} + +static int +sebsd_vnode_check_deleteextattr(struct ucred *cred, struct vnode *vp, + struct label *label, const char *name) +{ + + /* + * Our policy labels may not be removed. + * Labels may be changed, but all files must be labeled. + */ + if (bcmp(name, SEBSD_MAC_EXTATTR_NAME, + sizeof(SEBSD_MAC_EXTATTR_NAME)) == 0) + return (EPERM); + + /* + * Otherwise, it's not a recognized attribute and we do as + * SELinux does and check ordinary setattr permissions. + */ + return (vnode_has_perm(cred, vp, NULL, FILE__SETATTR)); +} + #if defined(FILE__POLL) && defined(FILE__GETATTR) static int sebsd_vnode_check_kqfilter(struct ucred *cred, struct ucred *file_cred, @@ -2386,6 +2414,14 @@ struct label *label, const char *name, struct uio *uio) { + /* + * XXX - This doesn't look like we're checking enough + * update_extattr doesn't actually check any permissions, + * it's called too late. + * + * If the 'name' belongs to our policy, we should make sure + * the new value is valid and permitted. + */ return (vnode_has_perm(cred, vp, NULL, FILE__SETATTR)); } @@ -3513,6 +3549,7 @@ .mpo_vnode_check_chdir = sebsd_vnode_check_chdir, .mpo_vnode_check_chroot = sebsd_vnode_check_chroot, .mpo_vnode_check_create = sebsd_vnode_check_create, + .mpo_vnode_check_deleteextattr = sebsd_vnode_check_deleteextattr, .mpo_vnode_check_exchangedata = sebsd_vnode_check_exchangedata, .mpo_vnode_check_exec = sebsd_vnode_check_exec, .mpo_vnode_check_getattrlist = sebsd_vnode_check_getattrlist, @@ -3520,6 +3557,7 @@ .mpo_vnode_check_ioctl = sebsd_vnode_check_ioctl, .mpo_vnode_check_label_update = sebsd_vnode_check_label_update, .mpo_vnode_check_link = sebsd_vnode_check_link, + .mpo_vnode_check_listextattr = sebsd_vnode_check_listextattr, .mpo_vnode_check_lookup = sebsd_vnode_check_lookup, .mpo_vnode_check_open = sebsd_vnode_check_open, .mpo_vnode_check_read = sebsd_vnode_check_read, From owner-p4-projects@FreeBSD.ORG Mon Jan 22 15:17:34 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA44B16A408; Mon, 22 Jan 2007 15:17:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C31EF16A403 for ; Mon, 22 Jan 2007 15:17:33 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B16FD13C43E for ; Mon, 22 Jan 2007 15:17:33 +0000 (UTC) (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 l0MFHXtH003992 for ; Mon, 22 Jan 2007 15:17:33 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFHSHR003988 for perforce@freebsd.org; Mon, 22 Jan 2007 15:17:28 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:17:28 GMT Message-Id: <200701221517.l0MFHSHR003988@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 113320 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 15:17:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=113320 Change 113320 by millert@millert_macbook on 2007/01/22 15:17:03 Add ifnet label support. Also add the ifnet label as an argument to mpo_mbuf_label_associate_ifnet like FreeBSD. Note that some network pseudo-devices (faith, gif, lo, stf) do not use dlil for allocation so we have to call mac_ifnet_label_init() directly for those. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/dlil.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_faith.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_gif.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_loop.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_stf.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_var.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/sockio.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#28 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_net.c#7 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#36 edit .. //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#26 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#59 edit .. //depot/projects/trustedbsd/sedarwin8/policies/test/mac_test.c#19 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/dlil.c#6 (text+ko) ==== @@ -1093,7 +1093,13 @@ } do { - +#ifdef MAC + retval = mac_ifnet_check_transmit(ifp, m); + if (retval) { + m_freem(m); + goto cleanup; + } +#endif if (ifp->if_framer) { retval = ifp->if_framer(ifp, &m, dest, dst_linkaddr, frame_type); @@ -1219,6 +1225,14 @@ goto cleanup; } } + +#ifdef MAC + retval = mac_ifnet_check_transmit(ifp, m); + if (retval) { + m_freem(m); + goto cleanup; + } +#endif /* * Call framing module @@ -2384,6 +2398,9 @@ ifa->ifa_debug |= IFA_ATTACHED; TAILQ_INSERT_HEAD(&ifp->if_addrhead, ifa, ifa_link); } +#ifdef MAC + mac_ifnet_label_associate(ifp); +#endif TAILQ_INSERT_TAIL(&ifnet_head, ifp, if_link); ifindex2ifnet[ifp->if_index] = ifp; @@ -2758,6 +2775,9 @@ ifp1 = (struct ifnet *)dlifp1; ifp1->if_eflags |= IFEF_INUSE; ifp1->if_name = dlifp1->if_namestorage; +#ifdef MAC + mac_ifnet_label_init(ifp1); +#endif TAILQ_INSERT_TAIL(&dlil_ifnet_head, dlifp1, dl_if_link); @@ -2785,6 +2805,15 @@ strncpy(dlifp->if_namestorage, ifp->if_name, IFNAMSIZ); ifp->if_name = dlifp->if_namestorage; +#ifdef MAC + /* + * We can either recycle the MAC label here or in dlil_if_acquire(). + * It seems logical to do it here but this means that anything that + * still has a handle on ifp will now see it as unlabeled. + * Since the interface is "dead" that may be OK. Revisit later. + */ + mac_ifnet_label_recycle(ifp); +#endif if (ifp->if_lock) ifnet_lock_done(ifp); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if.c#3 (text+ko) ==== @@ -104,6 +104,10 @@ #endif #endif +#ifdef MAC +#include +#endif + /* * System initialization */ @@ -1086,6 +1090,13 @@ ifnet_lock_done(ifp); break; +#ifdef MAC + case SIOCGIFMAC: + error = mac_ifnet_label_get(proc_ucred(p), ifr, ifp); + if (error) + return (error); + break; +#endif case SIOCGIFMETRIC: ifnet_lock_shared(ifp); ifr->ifr_metric = ifp->if_metric; @@ -1131,6 +1142,13 @@ ifnet_touch_lastchange(ifp); break; +#ifdef MAC + case SIOCSIFMAC: + error = mac_ifnet_label_set(proc_ucred(p), ifr, ifp); + if (error) + return (error); + break; +#endif case SIOCSIFMETRIC: error = proc_suser(p); if (error) ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_faith.c#3 (text+ko) ==== @@ -274,6 +274,9 @@ ifp->if_type = IFT_FAITH; ifp->if_hdrlen = 0; ifp->if_addrlen = 0; +#ifdef MAC + mac_ifnet_label_init(ifp); +#endif dlil_if_attach(ifp); #if NBPFILTER > 0 #ifdef HAVE_OLD_BPF ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_gif.c#3 (text+ko) ==== @@ -325,6 +325,9 @@ sc->gif_if.if_type = IFT_GIF; sc->gif_if.if_add_proto = gif_add_proto; sc->gif_if.if_del_proto = gif_del_proto; +#ifdef MAC + mac_ifnet_label_init(&sc->gif_if); +#endif dlil_if_attach(&sc->gif_if); bpfattach(&sc->gif_if, DLT_NULL, sizeof(u_int)); TAILQ_INSERT_TAIL(&gifs, sc, gif_link); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_loop.c#3 (text+ko) ==== @@ -472,6 +472,9 @@ ifp->if_type = IFT_LOOP; ifp->if_hwassist = IF_HWASSIST_CSUM_IP | IF_HWASSIST_CSUM_TCP | IF_HWASSIST_CSUM_UDP; ifp->if_hdrlen = sizeof(struct loopback_header); +#ifdef MAC + mac_ifnet_label_init(ifp); +#endif lo_ifp = ifp; dlil_if_attach(ifp); #if NBPFILTER > 0 ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_stf.c#2 (text+ko) ==== @@ -270,6 +270,9 @@ sc->sc_if.if_flags |= IFF_LINK2; #endif sc->sc_if.if_snd.ifq_maxlen = IFQ_MAXLEN; +#ifdef MAC + mac_ifnet_label_init(&sc->sc_if); +#endif if (error = dlil_if_attach(&sc->sc_if)) printf("stfattach: can't dlil_if_attach error=%d\n"); @@ -635,6 +638,10 @@ ifp = &sc->sc_if; +#ifdef MAC + mac_mbuf_label_associate_ifnet(ifp, m); +#endif + /* * perform sanity check against outer src/dst. * for source, perform ingress filter as well. ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_var.h#3 (text+ko) ==== @@ -439,6 +439,7 @@ u_char *ptr; } u; } if_broadcast; + struct label *if_label; /* interface MAC label */ }; #define if_add_proto if_add_proto_u.original ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/sockio.h#3 (text+ko) ==== @@ -179,4 +179,7 @@ #define SIOCSETOT _IOW('s', 128, int) /* set socket for LibOT */ #endif /* PRIVATE */ +#define SIOCGIFMAC _IOWR('i', 130, struct ifreq) /* get IF MAC label */ +#define SIOCSIFMAC _IOW('i', 131, struct ifreq) /* set IF MAC label */ + #endif /* !_SYS_SOCKIO_H_ */ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#28 (text+ko) ==== @@ -60,6 +60,7 @@ struct fdescnode; struct fileglob; struct ifnet; +struct ifreq; struct lctx; struct mac; struct mac_module_data; @@ -146,6 +147,15 @@ void mac_file_label_associate(struct ucred *cred, struct fileglob *fg); void mac_file_label_destroy(struct fileglob *fg); void mac_file_label_init(struct fileglob *fg); +int mac_ifnet_check_transmit(struct ifnet *ifp, struct mbuf *mbuf); +void mac_ifnet_label_associate(struct ifnet *ifp); +void mac_ifnet_label_destroy(struct ifnet *ifp); +int mac_ifnet_label_get(struct ucred *cred, struct ifreq *ifr, + struct ifnet *ifp); +void mac_ifnet_label_init(struct ifnet *ifp); +void mac_ifnet_label_recycle(struct ifnet *ifp); +int mac_ifnet_label_set(struct ucred *cred, struct ifreq *ifr, + struct ifnet *ifp); int mac_iokit_check_device(char *devtype, struct mac_module_data *mdata); int mac_lctx_check_label_update(struct lctx *l, struct label *newlabel); struct label *mac_lctx_label_alloc(void); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_net.c#7 (text+ko) ==== @@ -2,6 +2,7 @@ * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001 Ilmar S. Habibulin * Copyright (c) 2001-2004 Networks Associates Technology, Inc. + * Copyright (c) 2006 SPARTA, Inc. * All rights reserved. * * This software was developed by Robert Watson and Ilmar Habibulin for the @@ -38,6 +39,11 @@ #include #include +#include + +#include +#include + #include int mac_label_mbufs = 1; /* Exported via sysctl in mac_base.c */ @@ -67,6 +73,23 @@ return (label); } +static struct label * +mac_ifnet_label_alloc(void) +{ + struct label *label; + + label = mac_labelzone_alloc(M_WAITOK); + MAC_PERFORM(ifnet_label_init, label); + return (label); +} + +void +mac_ifnet_label_init(struct ifnet *ifp) +{ + + ifp->if_label = mac_ifnet_label_alloc(); +} + /* * On failure, caller should cleanup with m_tag_free(). */ @@ -86,7 +109,30 @@ return (error); } +static void +mac_ifnet_label_free(struct label *label) +{ + + MAC_PERFORM(ifnet_label_destroy, label); + mac_labelzone_free(label); +} + +void +mac_ifnet_label_destroy(struct ifnet *ifp) +{ + + mac_ifnet_label_free(ifp->if_label); + ifp->if_label = NULL; +} + void +mac_ifnet_label_recycle(struct ifnet *ifp) +{ + + MAC_PERFORM(ifnet_label_recycle, ifp->if_label); +} + +void mac_mbuf_tag_destroy(struct m_tag *tag) { struct label *label; @@ -132,6 +178,41 @@ MAC_PERFORM(mbuf_label_copy, src_label, dest_label); } +static void +mac_ifnet_label_copy(struct label *src, struct label *dest) +{ + + MAC_PERFORM(ifnet_label_copy, src, dest); +} + +static int +mac_ifnet_label_externalize(struct label *label, char *elements, + char *outbuf, size_t outbuflen) +{ + int error; + + error = MAC_EXTERNALIZE(ifnet, label, elements, outbuf, outbuflen); + + return (error); +} + +static int +mac_ifnet_label_internalize(struct label *label, char *string) +{ + int error; + + error = MAC_INTERNALIZE(ifnet, label, string); + + return (error); +} + +void +mac_ifnet_label_associate(struct ifnet *ifp) +{ + + MAC_PERFORM(ifnet_label_associate, ifp, ifp->if_label); +} + int mac_mbuf_label_init(struct mbuf *m, int flag) { @@ -171,16 +252,17 @@ } void -mac_mbuf_label_associate_ifnet(struct ifnet *ifnet, struct mbuf *mbuf) +mac_mbuf_label_associate_ifnet(struct ifnet *ifp, struct mbuf *mbuf) { - struct label *label; + struct label *m_label; - /* ifnet must be locked */ + /* ifp must be locked */ - label = mac_mbuf_to_label(mbuf); + m_label = mac_mbuf_to_label(mbuf); /* Policy must deal with NULL label (unlabeled mbufs) */ - MAC_PERFORM(mbuf_label_associate_ifnet, ifnet, mbuf, label); + MAC_PERFORM(mbuf_label_associate_ifnet, ifp, ifp->if_label, mbuf, + m_label); } void @@ -192,9 +274,133 @@ /* socket must be locked */ label = mac_mbuf_to_label(mbuf); - + /* Policy must deal with NULL label (unlabeled mbufs) */ sotoxsocket(socket, &xso); MAC_PERFORM(mbuf_label_associate_socket, &xso, socket->so_label, mbuf, label); } + +int +mac_ifnet_check_transmit(struct ifnet *ifp, struct mbuf *mbuf) +{ + struct label *label; + int error; + + label = mac_mbuf_to_label(mbuf); + + ifnet_lock_shared(ifp); + MAC_CHECK(ifnet_check_transmit, ifp, ifp->if_label, mbuf, label); + ifnet_lock_done(ifp); + + return (error); +} + +int +mac_ifnet_label_get(__unused struct ucred *cred, struct ifreq *ifr, + struct ifnet *ifp) +{ + char *elements, *buffer; + struct label *intlabel; + struct mac mac; + int error; + size_t len; + + error = copyin(CAST_USER_ADDR_T(ifr->ifr_ifru.ifru_data), + &mac, sizeof(mac)); + if (error) + return (error); + + error = mac_check_structmac_consistent(&mac); + if (error) + return (error); + + MALLOC(elements, char *, mac.m_buflen, M_MACTEMP, M_WAITOK); + error = copyinstr(CAST_USER_ADDR_T(mac.m_string), elements, + mac.m_buflen, &len); + if (error) { + FREE(elements, M_MACTEMP); + return (error); + } + AUDIT_ARG(mac_string, elements); + + MALLOC(buffer, char *, mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); + intlabel = mac_ifnet_label_alloc(); + ifnet_lock_shared(ifp); + mac_ifnet_label_copy(ifp->if_label, intlabel); + ifnet_lock_done(ifp); + error = mac_ifnet_label_externalize(intlabel, elements, + buffer, mac.m_buflen); + mac_ifnet_label_free(intlabel); + FREE(elements, M_MACTEMP); + + if (error == 0) + error = copyout(buffer, CAST_USER_ADDR_T(mac.m_string), + strlen(buffer) + 1); + FREE(buffer, M_MACTEMP); + + return (error); +} + +int +mac_ifnet_label_set(struct ucred *cred, struct ifreq *ifr, + struct ifnet *ifp) +{ + struct label *intlabel; + struct mac mac; + char *buffer; + int error; + size_t len; + + error = copyin(CAST_USER_ADDR_T(ifr->ifr_ifru.ifru_data), + &mac, sizeof(mac)); + if (error) + return (error); + + error = mac_check_structmac_consistent(&mac); + if (error) + return (error); + + MALLOC(buffer, char *, mac.m_buflen, M_MACTEMP, M_WAITOK); + error = copyinstr(CAST_USER_ADDR_T(mac.m_string), buffer, + mac.m_buflen, &len); + if (error) { + FREE(buffer, M_MACTEMP); + return (error); + } + AUDIT_ARG(mac_string, buffer); + + intlabel = mac_ifnet_label_alloc(); + error = mac_ifnet_label_internalize(intlabel, buffer); + FREE(buffer, M_MACTEMP); + if (error) { + mac_ifnet_label_free(intlabel); + return (error); + } + + /* + * XXX: Note that this is a redundant privilege check, since + * policies impose this check themselves if required by the + * policy. Eventually, this should go away. + */ + error = suser(cred, NULL); + if (error) { + mac_ifnet_label_free(intlabel); + return (error); + } + + ifnet_lock_exclusive(ifp); + MAC_CHECK(ifnet_check_label_update, cred, ifp, ifp->if_label, + intlabel); + if (error) { + ifnet_lock_done(ifp); + mac_ifnet_label_free(intlabel); + return (error); + } + + MAC_PERFORM(ifnet_label_update, cred, ifp, ifp->if_label, intlabel); + ifnet_lock_done(ifp); + mac_ifnet_label_free(intlabel); + + return (0); +} ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#36 (text+ko) ==== @@ -61,7 +61,6 @@ struct devnode; struct fileglob; struct ifnet; -struct ipq; struct label; struct lctx; struct mac_module_data; @@ -814,6 +813,159 @@ struct label *label ); /** + @brief Access control check for relabeling network interfaces + @param cred Subject credential + @param ifp network interface being relabeled + @param ifnetlabel Current label of the network interfaces + @param newlabel New label to apply to the network interfaces + @see mpo_ifnet_label_update_t + + Determine whether the subject identified by the credential can + relabel the network interface represented by ifp to the supplied + new label (newlabel). + + @return Return 0 if access is granted, otherwise an appropriate value for + errno should be returned. +*/ +typedef int mpo_ifnet_check_label_update_t( + struct ucred *cred, + struct ifnet *ifp, + struct label *ifnetlabel, + struct label *newlabel +); +/** + @brief Access control check for relabeling network interfaces + @param ifp Network interface mbuf will be transmitted through + @param ifnetlabel Label of the network interfaces + @param m The mbuf to be transmitted + @param mbuflabel Label of the mbuf to be transmitted + + Determine whether the mbuf with label mbuflabel may be transmitted + through the network interface represented by ifp that has the + label ifnetlabel. + + @return Return 0 if access is granted, otherwise an appropriate value for + errno should be returned. +*/ +typedef int mpo_ifnet_check_transmit_t( + struct ifnet *ifp, + struct label *ifnetlabel, + struct mbuf *m, + struct label *mbuflabel +); +/** + @brief Create a network interface label + @param ifp Network interface labeled + @param ifnetlabel Label for the network interface + + Set the label of a newly created network interface, most likely + using the information in the supplied network interface struct. +*/ +typedef void mpo_ifnet_label_associate_t( + struct ifnet *ifp, + struct label *ifnetlabel +); +/** + @brief Copy an ifnet label + @param src Source ifnet label + @param dest Destination ifnet label + + Copy the label information from src to dest. +*/ +typedef void mpo_ifnet_label_copy_t( + struct label *src, + struct label *dest +); +/** + @brief Destroy ifnet label + @param label The label to be destroyed +*/ +typedef void mpo_ifnet_label_destroy_t( + struct label *label +); +/** + @brief Externalize an ifnet label + @param label Label to be externalized + @param element_name Name of the label namespace for which labels should be + externalized + @param sb String buffer to be filled with a text representation of the label + + Produce an external representation of the label on an interface. + An externalized label consists of a text representation of the + label contents that can be used with user applications. + Policy-agnostic user space tools will display this externalized + version. + + @return 0 on success, return non-zero if an error occurs while + externalizing the label data. + +*/ +typedef int mpo_ifnet_label_externalize_t( + struct label *label, + char *element_name, + struct sbuf *sb +); +/** + @brief Initialize ifnet label + @param label New label to initialize +*/ +typedef void mpo_ifnet_label_init_t( + struct label *label +); +/** + @brief Internalize an interface label + @param label Label to be internalized + @param element_name Name of the label namespace for which the label should + be internalized + @param element_data Text data to be internalized + + Produce an interface label from an external representation. An + externalized label consists of a text representation of the label + contents that can be used with user applications. Policy-agnostic + user space tools will forward text version to the kernel for + processing by individual policy modules. + + The policy's internalize entry points will be called only if the + policy has registered interest in the label namespace. + + @return 0 on success, Otherwise, return non-zero if an error occurs + while internalizing the label data. + +*/ +typedef int mpo_ifnet_label_internalize_t( + struct label *label, + char *element_name, + char *element_data +); +/** + @brief Recycle up a network interface label + @param label The label to be recycled + + Recycle a network interface label. Darwin caches the struct ifnet + of detached ifnets in a "free pool". Before ifnets are returned + to the "free pool", policies can cleanup or overwrite any information + present in the label. +*/ +typedef void mpo_ifnet_label_recycle_t( + struct label *label +); +/** + @brief Update a network interface label + @param cred Subject credential + @param ifp The network interface to be relabeled + @param ifnetlabel The current label of the network interface + @param newlabel A new label to apply to the network interface + @see mpo_ifnet_check_label_update_t + + Update the label on a network interface, using the supplied new label. +*/ +typedef void mpo_ifnet_label_update_t( + struct ucred *cred, + struct ifnet *ifp, + struct label *ifnetlabel, + struct label *newlabel +); +/** @brief Device hardware access control @param devtype Type of device connected @param properties XML-formatted property list @@ -990,7 +1142,7 @@ ); /** @brief Assign a label to a new mbuf - @param ifnet Interface descriptor + @param ifp Interface descriptor @param m Object; mbuf @param m_label Policy label to fill in for m @@ -998,6 +1150,7 @@ */ typedef void mpo_mbuf_label_associate_ifnet_t( struct ifnet *ifp, + struct label *i_label, struct mbuf *m, struct label *m_label ); @@ -5025,6 +5178,16 @@ mpo_file_label_init_t *mpo_file_label_init; mpo_file_label_destroy_t *mpo_file_label_destroy; mpo_file_label_associate_t *mpo_file_label_associate; + mpo_ifnet_check_label_update_t *mpo_ifnet_check_label_update; + mpo_ifnet_check_transmit_t *mpo_ifnet_check_transmit; + mpo_ifnet_label_associate_t *mpo_ifnet_label_associate; + mpo_ifnet_label_copy_t *mpo_ifnet_label_copy; + mpo_ifnet_label_destroy_t *mpo_ifnet_label_destroy; + mpo_ifnet_label_externalize_t *mpo_ifnet_label_externalize; + mpo_ifnet_label_init_t *mpo_ifnet_label_init; + mpo_ifnet_label_internalize_t *mpo_ifnet_label_internalize; + mpo_ifnet_label_update_t *mpo_ifnet_label_update; + mpo_ifnet_label_recycle_t *mpo_ifnet_label_recycle; mpo_iokit_check_device_t *mpo_iokit_check_device; mpo_lctx_check_label_update_t *mpo_lctx_check_label_update; mpo_lctx_label_destroy_t *mpo_lctx_label_destroy; ==== //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#26 (text+ko) ==== @@ -1543,16 +1543,17 @@ static void mac_mls_mbuf_label_associate_ifnet(struct ifnet *ifnet, - struct mbuf *mbuf, struct label *mbuflabel) + struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel) { - struct mac_mls *dest; + struct mac_mls *source, *dest; - if (mbuflabel == NULL) + if (ifnetlabel == NULL || mbuflabel == NULL) return; + source = SLOT(ifnetlabel); dest = SLOT(mbuflabel); - mac_mls_set_effective(dest, MAC_MLS_TYPE_EQUAL, 0, NULL); + mac_mls_copy_effective(source, dest); } static void ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#59 (text+ko) ==== @@ -919,6 +919,7 @@ network_label_copy(blabel, mlabel); } +#endif static void sebsd_mbuf_label_associate_ifnet(struct ifnet *ifn, struct label *ilabel, @@ -927,7 +928,6 @@ network_label_copy(ilabel, mlabel); } -#endif static void sebsd_posixsem_label_associate(struct ucred *cred, struct pseminfo *psem, @@ -1800,7 +1800,7 @@ struct label *oldlabel, struct label *newlabel) { - network_label_copy(oldlabel, newlabel); + network_label_copy(newlabel, oldlabel); } static void @@ -3023,7 +3023,86 @@ return (file_has_perm(cred, fg, fglabel, 0)); } +static void +sebsd_ifnet_label_update(struct ucred *cred, struct ifnet *ifp, + struct label *ifnetlabel, struct label *newlabel) +{ + + network_label_copy(newlabel, ifnetlabel); +} + +static void +sebsd_ifnet_label_associate(struct ifnet *ifp, struct label *ifnetlabel) +{ + struct network_security_struct *nsec; + + /* + * We just set the label to a default value and require that + * the system set a more specific value at ifconfig time. + */ + nsec = SLOT(ifnetlabel); + if (nsec != NULL) { + nsec->sid = SECINITSID_NETIF; + nsec->sclass = SECCLASS_NETIF; + } +} + +#if 0 +static int +sebsd_ifnet_check_label_update(struct ucred *cred, struct ifnet *ifp, + struct label *ifnetlabel, struct label *newlabel) +{ + struct network_security_struct *nsec, *tsec; + int rc; + + nsec = SLOT(newlabel); + tsec = SLOT(socklabel); + + if (nsec == NULL) + return (0); + + /* XXX - no NETIF__RELABEL{TO,FROM} */ + rc = avc_has_perm(tsec->sid, tsec->sid, SECCLASS_NETIF, + SOCKET__RELABELFROM, NULL); + if (rc) + return (rc); + + rc = avc_has_perm(tsec->sid, nsec->sid, SECCLASS_NETIF, + SOCKET__RELABELTO, NULL); + if (rc) + return (rc); + + return (0); +} +#endif + static int +sebsd_ifnet_check_transmit(struct ifnet *ifp, + struct label *ifnetlabel, struct mbuf *m, struct label *mbuflabel) +{ + struct network_security_struct *ifsec, *msec; + int error; + + if (ifnetlabel == NULL || mbuflabel == NULL) { + /* XXX - mbufs are not always labelled! */ + return (0); + } + + ifsec = SLOT(ifnetlabel); + msec = SLOT(mbuflabel); + + if (ifsec == NULL || msec == NULL) { + /* XXX - should not happen, log and fix */ + return (0); + } + + /* XXX - use an audit struct so we can log useful info */ + error = avc_has_perm(msec->sid, ifsec->sid, SECCLASS_PACKET, + PACKET__SEND, NULL); + return (error); +} + +static int ipc_has_perm(struct ucred *cred, struct label *label, u_int32_t perm) { struct task_security_struct *task; @@ -3396,6 +3475,17 @@ .mpo_file_label_associate = sebsd_file_label_associate, .mpo_file_label_destroy = sebsd_label_destroy, .mpo_file_label_init = sebsd_label_init, + //.mpo_ifnet_check_label_update = XXX, + .mpo_ifnet_check_transmit = sebsd_ifnet_check_transmit, + .mpo_ifnet_label_associate = sebsd_ifnet_label_associate, + .mpo_ifnet_label_copy = sebsd_label_copy, + .mpo_ifnet_label_destroy = sebsd_label_destroy, + .mpo_ifnet_label_externalize = sebsd_label_externalize, + .mpo_ifnet_label_init = sebsd_label_init, + .mpo_ifnet_label_internalize = sebsd_label_internalize, + .mpo_ifnet_label_recycle = sebsd_label_recycle, + .mpo_ifnet_label_update = sebsd_ifnet_label_update, + .mpo_mbuf_label_associate_ifnet = sebsd_mbuf_label_associate_ifnet, .mpo_mbuf_label_associate_socket = sebsd_mbuf_label_associate_socket, .mpo_mbuf_label_copy = network_label_copy, .mpo_mbuf_label_destroy = sebsd_label_destroy, ==== //depot/projects/trustedbsd/sedarwin8/policies/test/mac_test.c#19 (text+ko) ==== @@ -1637,12 +1637,14 @@ } static void -mac_test_mbuf_label_associate_ifnet(struct ifnet *ifnet, +mac_test_mbuf_label_associate_ifnet(struct ifnet *ifnet, struct label *i_label, struct mbuf *m, struct label *m_label) { CHECKNULL(ifnet); CHECKNULL(m); + if (i_label != NULL) + INIT_LABEL(i_label, SOCKETTYPE); if (m_label != NULL) INIT_LABEL(m_label, SOCKETTYPE); } From owner-p4-projects@FreeBSD.ORG Mon Jan 22 15:18:36 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DBF0016A401; Mon, 22 Jan 2007 15:18:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A211A16A404 for ; Mon, 22 Jan 2007 15:18:35 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 90DB213C45B for ; Mon, 22 Jan 2007 15:18:35 +0000 (UTC) (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 l0MFIZrg004188 for ; Mon, 22 Jan 2007 15:18:35 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFIZ2G004185 for perforce@freebsd.org; Mon, 22 Jan 2007 15:18:35 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:18:35 GMT Message-Id: <200701221518.l0MFIZ2G004185@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 113321 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 15:18:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=113321 Change 113321 by millert@millert_macbook on 2007/01/22 15:18:10 Add support for labeling BPF descriptors. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/bpf.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/bpf.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/bpfdesc.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#29 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_net.c#8 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#37 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#60 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/bpf.c#6 (text+ko) ==== @@ -525,7 +525,7 @@ */ /* ARGSUSED */ int -bpfopen(dev_t dev, __unused int flags, __unused int fmt, __unused struct proc *p) +bpfopen(dev_t dev, __unused int flags, __unused int fmt, struct proc *p) { register struct bpf_d *d; @@ -575,6 +575,10 @@ d->bd_bufsize = bpf_bufsize; d->bd_sig = SIGIO; d->bd_seesent = 1; +#ifdef MAC + mac_bpfdesc_label_init(d); + mac_bpfdesc_label_associate(proc_ucred(p), d); +#endif bpf_dtab[minor(dev)] = d; /* Mark opened */ return (0); @@ -602,6 +606,9 @@ if (d->bd_bif) bpf_detachd(d); selthreadclear(&d->bd_sel); +#ifdef MAC + mac_bpfdesc_label_destroy(d); +#endif bpf_freed(d); lck_mtx_unlock(bpf_mlock); @@ -1334,8 +1341,13 @@ for (d = bp->bif_dlist; d != 0; d = d->bd_next) { ++d->bd_rcount; slen = bpf_filter(d->bd_filter, pkt, pktlen, pktlen); - if (slen != 0) + if (slen != 0) { +#ifdef MAC + if (mac_bpfdesc_check_receive(d, bp->bif_ifp) != 0) + continue; +#endif catchpacket(d, pkt, pktlen, slen, bcopy); + } } #ifdef __APPLE__ } @@ -1391,8 +1403,13 @@ continue; ++d->bd_rcount; slen = bpf_filter(d->bd_filter, (u_char *)m, pktlen, 0); - if (slen != 0) + if (slen != 0) { +#ifdef MAC + if (mac_bpfdesc_check_receive(d, bp->bif_ifp) != 0) + continue; +#endif catchpacket(d, (u_char *)m, pktlen, slen, bpf_mcopy); + } } } @@ -1679,6 +1696,22 @@ SYSINIT(bpfdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,bpf_drvinit,NULL) #endif +#ifdef MAC +struct label * +mac_bpfdesc_label_get(struct bpf_d *d) +{ + + return (d->bd_label); +} + +void +mac_bpfdesc_label_set(struct bpf_d *d, struct label *label) +{ + + d->bd_label = label; +} +#endif + #else /* !BPF */ #ifndef __APPLE__ /* ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/bpf.h#3 (text+ko) ==== @@ -399,6 +399,13 @@ @param header_length The length, in bytes, of the data link header. */ void bpfattach(ifnet_t interface, u_int data_link_type, u_int header_length); + +#ifdef MAC +struct label; +struct bpf_d; +struct label *mac_bpfdesc_label_get(struct bpf_d *d); +void mac_bpfdesc_label_set(struct bpf_d *d, struct label *label); +#endif #endif /* KERNEL */ /* ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/bpfdesc.h#3 (text+ko) ==== @@ -128,7 +128,7 @@ #endif int bd_hdrcmplt; /* false to fill in src lladdr automatically */ int bd_seesent; /* true if bpf should see sent packets */ - + struct label * bd_label; /* MAC label for descriptor */ }; /* ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#29 (text+ko) ==== @@ -95,6 +95,10 @@ void *args, int error, int retval, int mac_forced); int mac_audit_check_preselect(struct ucred *cred, unsigned short syscode, void *args); +int mac_bpfdesc_check_receive(struct bpf_d *bpf_d, struct ifnet *ifp); +void mac_bpfdesc_label_destroy(struct bpf_d *bpf_d); +void mac_bpfdesc_label_init(struct bpf_d *bpf_d); +void mac_bpfdesc_label_associate(struct ucred *cred, struct bpf_d *bpf_d); int mac_cred_check_label_update(struct ucred *cred, struct label *newlabel); int mac_cred_check_label_update_execve(struct ucred *old, ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_net.c#8 (text+ko) ==== @@ -39,6 +39,7 @@ #include #include +#include #include #include @@ -74,6 +75,25 @@ } static struct label * +mac_bpfdesc_label_alloc(void) +{ + struct label *label; + + label = mac_labelzone_alloc(M_WAITOK); + MAC_PERFORM(bpfdesc_label_init, label); + return (label); +} + +void +mac_bpfdesc_label_init(struct bpf_d *bpf_d) +{ + struct label *label; + + label = mac_bpfdesc_label_alloc(); + mac_bpfdesc_label_set(bpf_d, label); +} + +static struct label * mac_ifnet_label_alloc(void) { struct label *label; @@ -110,6 +130,24 @@ } static void +mac_bpfdesc_label_free(struct label *label) +{ + + MAC_PERFORM(bpfdesc_label_destroy, label); + mac_labelzone_free(label); +} + +void +mac_bpfdesc_label_destroy(struct bpf_d *bpf_d) +{ + struct label *label; + + label = mac_bpfdesc_label_get(bpf_d); + mac_bpfdesc_label_free(label); + mac_bpfdesc_label_set(bpf_d, NULL); +} + +static void mac_ifnet_label_free(struct label *label) { @@ -213,7 +251,31 @@ MAC_PERFORM(ifnet_label_associate, ifp, ifp->if_label); } +void +mac_bpfdesc_label_associate(struct ucred *cred, struct bpf_d *bpf_d) +{ + struct label *label; + + label = mac_bpfdesc_label_get(bpf_d); + MAC_PERFORM(bpfdesc_label_associate, cred, bpf_d, label); +} + int +mac_bpfdesc_check_receive(struct bpf_d *bpf_d, struct ifnet *ifp) +{ + struct label *label; + int error; + + label = mac_bpfdesc_label_get(bpf_d); + ifnet_lock_shared(ifp); + MAC_CHECK(bpfdesc_check_receive, bpf_d, label, ifp, + ifp->if_label); + ifnet_lock_done(ifp); + + return (error); +} + +int mac_mbuf_label_init(struct mbuf *m, int flag) { struct m_tag *tag; @@ -241,14 +303,16 @@ void mac_mbuf_label_associate_bpfdesc(struct bpf_d *bpf_d, struct mbuf *mbuf) { - struct label *label; + struct label *m_label, *b_label; /* bpf_d must be locked */ - label = mac_mbuf_to_label(mbuf); + m_label = mac_mbuf_to_label(mbuf); + b_label = mac_bpfdesc_label_get(bpf_d); /* Policy must deal with NULL label (unlabeled mbufs) */ - MAC_PERFORM(mbuf_label_associate_bpfdesc, bpf_d, mbuf, label); + MAC_PERFORM(mbuf_label_associate_bpfdesc, bpf_d, b_label, mbuf, + m_label); } void ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#37 (text+ko) ==== @@ -184,6 +184,61 @@ void *args ); /** + @brief Initialize BPF descriptor label + @param label New label to initialize + + Initialize the label for a newly instantiated BPF descriptor. + Sleeping is permitted. +*/ +typedef void mpo_bpfdesc_label_init_t( + struct label *label +); +/** + @brief Destroy BPF descriptor label + @param label The label to be destroyed + + Destroy a BPF descriptor label. Since the BPF descriptor + is going out of scope, policy modules should free any internal + storage associated with the label so that it may be destroyed. +*/ +typedef void mpo_bpfdesc_label_destroy_t( + struct label *label +); +/** + @brief Associate a BPF descriptor with a label + @param cred User credential creating the BPF descriptor + @param bpf_d The BPF descriptor + @param bpflabel The new label + + Set the label on a newly created BPF descriptor from the passed + subject credential. This call will be made when a BPF device node + is opened by a process with the passed subject credential. +*/ +typedef void mpo_bpfdesc_label_associate_t( + struct ucred *cred, + struct bpf_d *bpf_d, + struct label *bpflabel +); +/** + @brief Check whether BPF can read from a network interface + @param bpf_d Subject; the BPF descriptor + @param bpflabel Policy label for bpf_d + @param ifp Object; the network interface + @param ifnetlabel Policy label for ifp + + Determine whether the MAC framework should permit datagrams from + the passed network interface to be delivered to the buffers of + the passed BPF descriptor. Return (0) for success, or an errno + value for failure. Suggested failure: EACCES for label mismatches, + EPERM for lack of privilege. +*/ +typedef int mpo_bpfdesc_check_receive_t( + struct bpf_d *bpf_d, + struct label *bpflabel, + struct ifnet *ifp, + struct label *ifnetlabel +); +/** @brief Indicate desire to change the process label at exec time @param old Existing subject credential @param vp File being executed @@ -1130,19 +1185,25 @@ /** @brief Assign a label to a new mbuf @param bpf_d BPF descriptor + @param b_label Policy label for bpf_d @param m Object; mbuf @param m_label Policy label to fill in for m - Label an mbuf based on the BPF descriptor from which it was received. + Set the label on the mbuf header of a newly created datagram + generated using the passed BPF descriptor. This call is made when + a write is performed to the BPF device associated with the passed + BPF descriptor. */ typedef void mpo_mbuf_label_associate_bpfdesc_t( struct bpf_d *bpf_d, + struct label *b_label, struct mbuf *m, struct label *m_label ); /** @brief Assign a label to a new mbuf @param ifp Interface descriptor + @param i_label Existing label of ifp @param m Object; mbuf @param m_label Policy label to fill in for m @@ -5143,6 +5204,10 @@ struct mac_policy_ops { mpo_audit_check_postselect_t *mpo_audit_check_postselect; mpo_audit_check_preselect_t *mpo_audit_check_preselect; + mpo_bpfdesc_label_associate_t *mpo_bpfdesc_label_associate; + mpo_bpfdesc_label_destroy_t *mpo_bpfdesc_label_destroy; + mpo_bpfdesc_label_init_t *mpo_bpfdesc_label_init; + mpo_bpfdesc_check_receive_t *mpo_bpfdesc_check_receive; mpo_cred_check_label_update_execve_t *mpo_cred_check_label_update_execve; mpo_cred_check_label_update_t *mpo_cred_check_label_update; mpo_cred_check_visible_t *mpo_cred_check_visible; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#60 (text+ko) ==== @@ -910,8 +910,21 @@ psec->sclass = SECCLASS_MACH_PORT; } -/* XXX - the Darwin framework lacks ifnet and bpf labels */ -#if 0 +static void +sebsd_bpfdesc_label_associate(struct ucred *cred, struct bpf_d *bpf_d, + struct label *bpflabel) +{ + struct task_security_struct *tsec; + struct network_security_struct *nsec; + + nsec = SLOT(bpflabel); + tsec = SLOT(cred->cr_label); + + nsec->sid = tsec->sid; + nsec->task_sid = tsec->sid; + nsec->sclass = SECCLASS_PACKET; /* XXX - probably want a bpf class */ +} + static void sebsd_mbuf_label_associate_bpfdesc(struct bpf_d *b, struct label *blabel, struct mbuf *m, struct label *mlabel) @@ -919,7 +932,6 @@ network_label_copy(blabel, mlabel); } -#endif static void sebsd_mbuf_label_associate_ifnet(struct ifnet *ifn, struct label *ilabel, @@ -1845,8 +1857,9 @@ } static void -sebsd_socketpeer_label_associate_socket(struct xsocket *olds, struct label *oldslabel, - struct xsocket *news, struct label *newsockpeerlabel) +sebsd_socketpeer_label_associate_socket(struct xsocket *olds, + struct label *oldslabel, struct xsocket *news, + struct label *newsockpeerlabel) { network_label_copy(oldslabel, newsockpeerlabel); @@ -3084,7 +3097,7 @@ int error; if (ifnetlabel == NULL || mbuflabel == NULL) { - /* XXX - mbufs are not always labelled! */ + /* XXX - mbufs are not always labeled! */ return (0); } @@ -3445,7 +3458,10 @@ } static struct mac_policy_ops sebsd_ops = { - .mpo_cred_check_label_update =sebsd_cred_check_label_update, + .mpo_bpfdesc_label_associate = sebsd_bpfdesc_label_associate, + .mpo_bpfdesc_label_destroy = sebsd_label_destroy, + .mpo_bpfdesc_label_init = sebsd_label_init, + .mpo_cred_check_label_update = sebsd_cred_check_label_update, .mpo_cred_check_label_update_execve = sebsd_cred_check_label_update_execve, .mpo_cred_label_associate = sebsd_cred_label_associate, .mpo_cred_label_associate_kernel = sebsd_cred_label_associate_kproc, @@ -3485,6 +3501,7 @@ .mpo_ifnet_label_internalize = sebsd_label_internalize, .mpo_ifnet_label_recycle = sebsd_label_recycle, .mpo_ifnet_label_update = sebsd_ifnet_label_update, + .mpo_mbuf_label_associate_bpfdesc = sebsd_mbuf_label_associate_bpfdesc, .mpo_mbuf_label_associate_ifnet = sebsd_mbuf_label_associate_ifnet, .mpo_mbuf_label_associate_socket = sebsd_mbuf_label_associate_socket, .mpo_mbuf_label_copy = network_label_copy, From owner-p4-projects@FreeBSD.ORG Mon Jan 22 15:20:39 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7090916A40D; Mon, 22 Jan 2007 15:20:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 339D216A408 for ; Mon, 22 Jan 2007 15:20:39 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E74F013C469 for ; Mon, 22 Jan 2007 15:20:38 +0000 (UTC) (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 l0MFKcPb004415 for ; Mon, 22 Jan 2007 15:20:38 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFKcvo004412 for perforce@freebsd.org; Mon, 22 Jan 2007 15:20:38 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:20:38 GMT Message-Id: <200701221520.l0MFKcvo004412@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 113322 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 15:20:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=113322 Change 113322 by millert@millert_macbook on 2007/01/22 15:19:53 Use m_dup_pkthdr() instead of M_COPY_PKTHDR() in m_copym() and m_copym_with_hdrs() since with MAC, M_COPY_PKTHDR() moves the mbuf tags instead of copying them, which effectively leaves the source mbuf unlabeled. Also need to zero out m_pkthdr.aux in the source mbuf after m_dup_pkthdr(). m_copy_pkthdr() did this for us but m_dup_pkthdr() does not. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_mbuf.c#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_mbuf.c#6 (text+ko) ==== @@ -1536,7 +1536,11 @@ if (n == 0) goto nospace; if (copyhdr) { - M_COPY_PKTHDR(n, m); + MBUF_UNLOCK(); + if (!m_dup_pkthdr(n, m, wait)) + goto nospace_unlock; + MBUF_LOCK(); + m->m_pkthdr.aux = (struct mbuf *)NULL; if (len == M_COPYALL) n->m_pkthdr.len -= off0; else @@ -1579,6 +1583,7 @@ nospace: MBUF_UNLOCK(); +nospace_unlock: m_freem(top); MCFail++; return (0); @@ -1677,7 +1682,11 @@ *np = n; if (copyhdr) { - M_COPY_PKTHDR(n, m); + MBUF_UNLOCK(); + if (!m_dup_pkthdr(n, m, wait)) + goto nospace_unlock; + MBUF_LOCK(); + m->m_pkthdr.aux = (struct mbuf *)NULL; n->m_pkthdr.len = len; copyhdr = 0; } From owner-p4-projects@FreeBSD.ORG Mon Jan 22 15:25:46 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E04F16A403; Mon, 22 Jan 2007 15:25:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 19C8D16A400 for ; Mon, 22 Jan 2007 15:25:46 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 066DF13C45B for ; Mon, 22 Jan 2007 15:25:46 +0000 (UTC) (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 l0MFPjbB010599 for ; Mon, 22 Jan 2007 15:25:46 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFPj7F010595 for perforce@freebsd.org; Mon, 22 Jan 2007 15:25:45 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:25:45 GMT Message-Id: <200701221525.l0MFPj7F010595@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 113325 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 15:25:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=113325 Change 113325 by millert@millert_macbook on 2007/01/22 15:24:55 Add network_cmds-245.15 so we can modify ifconfig. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/Makefile#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/Makefile.include#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/alias/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/alias/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/alias/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/alias/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/alias/alias.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/alias/alias.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/alias/alias_cuseeme.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/alias/alias_db.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/alias/alias_ftp.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/alias/alias_irc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/alias/alias_local.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/alias/alias_nbt.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/alias/alias_pptp.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/alias/alias_proxy.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/alias/alias_smedia.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/alias/alias_util.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/arp.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/arp.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/arp.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/arp.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/arp.tproj/arp.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/arp.tproj/arp.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/arp.tproj/arp4.4#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/bootparams/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/bootparams/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/bootparams/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/bootparams/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/bootparams/bootparamd.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/bootparams/bootparamd.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/bootparams/bootparamd.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/bootparams/bootparamd.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/bootparams/bootparamd.tproj/bootparam_proc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/bootparams/bootparamd.tproj/bootparamd.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/bootparams/bootparamd.tproj/bootparamd.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/bootparams/bootparams/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/bootparams/bootparams/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/bootparams/bootparams/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/bootparams/bootparams/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/bootparams/bootparams/bootparam_prot.x#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/bootparams/bpwhoami.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/bootparams/bpwhoami.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/bootparams/bpwhoami.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/bootparams/bpwhoami.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/bootparams/bpwhoami.tproj/bpwhoami.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/bootparams/bpwhoami.tproj/bpwhoami.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/domainname.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/domainname.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/domainname.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/domainname.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/domainname.tproj/domainname.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/domainname.tproj/domainname.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/eaytest.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/eaytest.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/eaytest.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/eaytest.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/eaytest.tproj/crypto_openssl.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/eaytest.tproj/crypto_openssl.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/eaytest.tproj/eaytest.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/eaytest.tproj/misc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/eaytest.tproj/misc.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/eaytest.tproj/rijndael-alg-fst.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/eaytest.tproj/rijndael-alg-fst.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/eaytest.tproj/rijndael-api-fst.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/eaytest.tproj/rijndael-api-fst.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/eaytest.tproj/sha2.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/eaytest.tproj/sha2.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/eaytest.tproj/str2val.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/eaytest.tproj/str2val.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/eaytest.tproj/vmbuf.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/eaytest.tproj/vmbuf.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ifconfig.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ifconfig.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ifconfig.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ifconfig.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ifconfig.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ifconfig.tproj/ifbond.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ifconfig.tproj/ifconfig.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ifconfig.tproj/ifconfig.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ifconfig.tproj/ifconfig.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ifconfig.tproj/ifmac.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ifconfig.tproj/ifmedia.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ifconfig.tproj/ifvlan.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ip6conf.tproj/6to4.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ip6conf.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ip6conf.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ip6conf.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ip6conf.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ip6conf.tproj/ip6.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ip6conf.tproj/ip6config#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ip6conf.tproj/ip6config.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ip6conf.tproj/ip6tool.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ip6fw.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ip6fw.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ip6fw.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ip6fw.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ip6fw.tproj/ip6fw.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ip6fw.tproj/ip6fw.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ipfw.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ipfw.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ipfw.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ipfw.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ipfw.tproj/ipfw.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ipfw.tproj/ipfw2.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ipsec/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ipsec/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ipsec/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ipsec/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ipsec/ipsec_dump_policy.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ipsec/ipsec_get_policylen.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ipsec/ipsec_set_policy.3#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ipsec/ipsec_strerror.3#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ipsec/ipsec_strerror.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ipsec/ipsec_strerror.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ipsec/key_debug.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ipsec/libpfkey.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ipsec/policy_parse.y#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ipsec/policy_token.l#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/kdumpd.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/kdumpd.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/kdumpd.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/kdumpd.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/kdumpd.tproj/kdump.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/kdumpd.tproj/kdumpd.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/kdumpd.tproj/kdumpd.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/kdumpd.tproj/kdumpsubs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/kdumpd.tproj/kdumpsubs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/logger.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/logger.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/logger.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/logger.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/logger.tproj/h.template#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/logger.tproj/logger.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/logger.tproj/logger.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/logger.tproj/m.template#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/makedbm.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/makedbm.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/makedbm.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/makedbm.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/makedbm.tproj/_db.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/makedbm.tproj/db.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/makedbm.tproj/makedbm.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/makedbm.tproj/makedbm.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/makedbm.tproj/ypdb.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/makedbm.tproj/ypdb.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/makedbm.tproj/ypdef.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/natd.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/natd.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/natd.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/natd.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/natd.tproj/icmp.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/natd.tproj/natd.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/natd.tproj/natd.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/natd.tproj/natd.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ndp.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ndp.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ndp.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ndp.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ndp.tproj/gnuc.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ndp.tproj/ndp.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ndp.tproj/ndp.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/netstat.tproj/DERIVED_FILES#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/netstat.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/netstat.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/netstat.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/netstat.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/netstat.tproj/data.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/netstat.tproj/if.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/netstat.tproj/inet.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/netstat.tproj/inet6.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/netstat.tproj/ipsec.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/netstat.tproj/main.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/netstat.tproj/mbuf.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/netstat.tproj/mroute.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/netstat.tproj/mroute6.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/netstat.tproj/netstat.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/netstat.tproj/netstat.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/netstat.tproj/route.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/netstat.tproj/tp_astring.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/netstat.tproj/unix.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/nfsd.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/nfsd.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/nfsd.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/nfsd.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/nfsd.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/nfsd.tproj/nfsd.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/nfsd.tproj/nfsd.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/nfsiod.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/nfsiod.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/nfsiod.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/nfsiod.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/nfsiod.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/nfsiod.tproj/nfsiod.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/nfsiod.tproj/nfsiod.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/nfsstat.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/nfsstat.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/nfsstat.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/nfsstat.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/nfsstat.tproj/nfsstat.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/nfsstat.tproj/nfsstat.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ping.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ping.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ping.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ping.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ping.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ping.tproj/ping.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ping.tproj/ping.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ping6.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ping6.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ping6.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ping6.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ping6.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ping6.tproj/md5.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ping6.tproj/md5.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ping6.tproj/ping6.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ping6.tproj/ping6.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/admin.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/admin.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/admin_var.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/algorithm.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/algorithm.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/anonymous.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/arc4random.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/backupsa.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/backupsa.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/boxes-fst.dat#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/cfparse.y#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/cftoken.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/cftoken.l#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/crypto_cssm.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/crypto_cssm.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/crypto_openssl.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/crypto_openssl.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/debug.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/dhgroup.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/dnssec.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/dnssec.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/gcmalloc.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/getcertsbyname.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/grabmyaddr.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/grabmyaddr.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/gssapi.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/gssapi.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/handler.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/handler.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/ipsec_doi.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/ipsec_doi.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/isakmp.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/isakmp.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/isakmp_agg.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/isakmp_agg.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/isakmp_base.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/isakmp_base.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/isakmp_ident.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/isakmp_ident.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/isakmp_inf.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/isakmp_inf.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/isakmp_natd.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/isakmp_natd.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/isakmp_newg.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/isakmp_newg.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/isakmp_quick.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/isakmp_quick.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/isakmp_var.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/key_debug.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/libpfkey.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/localconf.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/localconf.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/logger.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/logger.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/main.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/misc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/misc.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/netdb_dnssec.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/oakley.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/oakley.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/open_dir.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/open_dir.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/pfkey.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/pfkey.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/pfkey2.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/pfkey_dump.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/plog.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/plog.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/policy.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/policy.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/proposal.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/proposal.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/psk.txt#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/racoon.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/racoon.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/racoon.conf.5#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/remoteconf.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/remoteconf.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/rijndael-alg-fst.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/rijndael-alg-fst.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/rijndael-api-fst.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/rijndael-api-fst.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/rijndael.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/rijndael_local.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/safefile.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/safefile.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/sainfo.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/sainfo.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/schedule.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/schedule.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/session.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/session.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/sha2.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/sha2.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/sockmisc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/sockmisc.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/str2val.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/str2val.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/strnames.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/strnames.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/var.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/vendorid.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/vendorid.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/vmbuf.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/racoon.tproj/vmbuf.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rarpd.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rarpd.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rarpd.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rarpd.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rarpd.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rarpd.tproj/rarpd.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rarpd.tproj/rarpd.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rcp.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rcp.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rcp.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rcp.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rcp.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rcp.tproj/extern.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rcp.tproj/pathnames.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rcp.tproj/rcp.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rcp.tproj/rcp.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rcp.tproj/util.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/revnetgroup.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/revnetgroup.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/revnetgroup.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/revnetgroup.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/revnetgroup.tproj/hash.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/revnetgroup.tproj/hash.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/revnetgroup.tproj/parse_netgroup.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/revnetgroup.tproj/revnetgroup.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/revnetgroup.tproj/revnetgroup.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rexecd.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rexecd.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rexecd.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rexecd.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rexecd.tproj/exec.plist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rexecd.tproj/rexecd.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rexecd.tproj/rexecd.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rlogin.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rlogin.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rlogin.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rlogin.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rlogin.tproj/des_rw.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rlogin.tproj/kcmd.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rlogin.tproj/krb.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rlogin.tproj/krcmd.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rlogin.tproj/rlogin.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rlogin.tproj/rlogin.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rlogind.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rlogind.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rlogind.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rlogind.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rlogind.tproj/login.plist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rlogind.tproj/pathnames.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rlogind.tproj/rlogind.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rlogind.tproj/rlogind.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/route.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/route.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/route.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/route.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/route.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/route.tproj/keywords.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/route.tproj/route.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/route.tproj/route.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/routed.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/routed.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/routed.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/routed.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/routed.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/routed.tproj/af.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/routed.tproj/af.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/routed.tproj/defs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/routed.tproj/defs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/routed.tproj/if.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/routed.tproj/inet.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/routed.tproj/input.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/routed.tproj/interface.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/routed.tproj/main.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/routed.tproj/output.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/routed.tproj/pathnames.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/routed.tproj/routed.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/routed.tproj/startup.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/routed.tproj/table.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/routed.tproj/tables.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/routed.tproj/timer.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/routed.tproj/trace.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/routed.tproj/trace.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_lockd.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_lockd.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_lockd.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_lockd.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_lockd.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_lockd.tproj/kern.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_lockd.tproj/lock_proc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_lockd.tproj/lockd.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_lockd.tproj/lockd.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_lockd.tproj/lockd_lock.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_lockd.tproj/lockd_lock.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_lockd.tproj/nlm_prot_svc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_lockd.tproj/nlm_prot_xdr.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_lockd.tproj/rpc.lockd.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_lockd.tproj/sm_inter_xdr.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_lockd.tproj/test.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_statd.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_statd.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_statd.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_statd.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_statd.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_statd.tproj/file.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_statd.tproj/procs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_statd.tproj/rpc.statd.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_statd.tproj/sm_inter_svc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_statd.tproj/sm_inter_xdr.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_statd.tproj/statd.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_statd.tproj/statd.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_statd.tproj/test.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_yppasswdd.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_yppasswdd.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_yppasswdd.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_yppasswdd.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_yppasswdd.tproj/passwd.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_yppasswdd.tproj/rpc.yppasswdd.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_yppasswdd.tproj/rpc.yppasswdd.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_yppasswdd.tproj/yppasswd.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_yppasswdd.tproj/yppasswdd_mkpw.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpc_yppasswdd.tproj/yppasswdd_proc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpcinfo.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpcinfo.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpcinfo.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpcinfo.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpcinfo.tproj/h.template#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpcinfo.tproj/m.template#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rpcinfo.tproj/rpcinfo.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rsh.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rsh.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rsh.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rsh.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rsh.tproj/rsh.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rsh.tproj/rsh.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rshd.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rshd.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rshd.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rshd.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rshd.tproj/rshd.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rshd.tproj/rshd.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rshd.tproj/shell.plist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtadvd.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtadvd.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtadvd.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtadvd.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtadvd.tproj/advcap.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtadvd.tproj/advcap.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtadvd.tproj/config.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtadvd.tproj/config.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtadvd.tproj/dump.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtadvd.tproj/dump.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtadvd.tproj/if.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtadvd.tproj/if.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtadvd.tproj/pathnames.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtadvd.tproj/rrenum.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtadvd.tproj/rrenum.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtadvd.tproj/rtadvd.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtadvd.tproj/rtadvd.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtadvd.tproj/rtadvd.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtadvd.tproj/rtadvd.conf.5#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtadvd.tproj/rtadvd.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtadvd.tproj/timer.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtadvd.tproj/timer.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtsol.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtsol.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtsol.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtsol.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtsol.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtsol.tproj/dump.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtsol.tproj/if.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtsol.tproj/probe.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtsol.tproj/rtsock.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtsol.tproj/rtsol.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtsol.tproj/rtsol.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtsol.tproj/rtsold.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rtsol.tproj/rtsold.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ruptime.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ruptime.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ruptime.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ruptime.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ruptime.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ruptime.tproj/h.template#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ruptime.tproj/m.template#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ruptime.tproj/ruptime.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ruptime.tproj/ruptime.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rwho.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rwho.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rwho.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rwho.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rwho.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rwho.tproj/rwho.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rwho.tproj/rwho.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rwhod.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rwhod.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rwhod.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rwhod.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rwhod.tproj/rwhod.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/rwhod.tproj/rwhod.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/setkey.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/setkey.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/setkey.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/setkey.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/setkey.tproj/ipsec_strerror.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/setkey.tproj/key_debug.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/setkey.tproj/key_debug.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/setkey.tproj/libpfkey.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/setkey.tproj/parse.y#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/setkey.tproj/pfkey.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/setkey.tproj/pfkey_dump.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/setkey.tproj/setkey.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/setkey.tproj/setkey.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/setkey.tproj/token.l#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/setkey.tproj/vchar.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/slattach.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/slattach.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/slattach.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/slattach.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/slattach.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/slattach.tproj/slattach.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/slattach.tproj/slattach.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/spray.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/spray.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/spray.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/spray.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/spray.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/spray.tproj/spray.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/spray.tproj/spray.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/spray.tproj/spray.x#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/stdethers.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/stdethers.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/stdethers.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/stdethers.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/stdethers.tproj/stdethers.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/stdethers.tproj/stdethers.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/stdhosts.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/stdhosts.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/stdhosts.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/stdhosts.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/stdhosts.tproj/stdhosts.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/stdhosts.tproj/stdhosts.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talk.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talk.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talk.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talk.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talk.tproj/ctl.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talk.tproj/ctl_transact.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talk.tproj/display.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talk.tproj/get_addrs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talk.tproj/get_names.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talk.tproj/init_disp.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talk.tproj/invite.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talk.tproj/io.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talk.tproj/look_up.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talk.tproj/msgs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talk.tproj/talk.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talk.tproj/talk.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talk.tproj/talk.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talk.tproj/talk_ctl.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talkd.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talkd.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talkd.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talkd.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talkd.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talkd.tproj/announce.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talkd.tproj/ntalk.plist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talkd.tproj/print.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talkd.tproj/process.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talkd.tproj/table.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talkd.tproj/talkd.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talkd.tproj/talkd.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/talkd.tproj/talkd.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/README#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/authenc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/commands.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/defines.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/externs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/fdset.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/general.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/krb4-proto.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/main.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/misc-proto.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/misc.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/network.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/ring.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/ring.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/sys_bsd.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/telnet.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/telnet.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/terminal.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/tn3270.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/types.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnet.tproj/utilities.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnetd.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnetd.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnetd.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnetd.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnetd.tproj/defs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnetd.tproj/ext.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnetd.tproj/global.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnetd.tproj/pathnames.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnetd.tproj/slc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnetd.tproj/state.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnetd.tproj/strlcpy.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnetd.tproj/sys_term.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnetd.tproj/telnet.plist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnetd.tproj/telnetd.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnetd.tproj/telnetd.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnetd.tproj/telnetd.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnetd.tproj/termstat.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnetd.tproj/utility.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/telnetd.tproj/vasprintf.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/tftp.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/tftp.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/tftp.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/tftp.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/tftp.tproj/extern.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/tftp.tproj/main.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/tftp.tproj/tftp.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/tftp.tproj/tftp.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/tftp.tproj/tftp.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/tftp.tproj/tftpsubs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/tftp.tproj/tftpsubs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/tftpd.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/tftpd.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/tftpd.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/tftpd.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/tftpd.tproj/tftp.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/tftpd.tproj/tftp.plist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/tftpd.tproj/tftp.plist-SERVER#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/tftpd.tproj/tftpd.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/tftpd.tproj/tftpd.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/tftpd.tproj/tftpsubs.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/tftpd.tproj/tftpsubs.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timed.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timed.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timed.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timed.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timed.tproj/acksend.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timed.tproj/byteorder.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timed.tproj/candidate.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timed.tproj/cksum.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timed.tproj/correct.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timed.tproj/extern.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timed.tproj/globals.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timed.tproj/master.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timed.tproj/measure.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timed.tproj/networkdelta.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timed.tproj/pathnames.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timed.tproj/readmsg.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timed.tproj/slave.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timed.tproj/timed.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timed.tproj/timed.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timedc.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timedc.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timedc.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timedc.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timedc.tproj/cmds.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timedc.tproj/cmdtab.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timedc.tproj/extern.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timedc.tproj/h.template#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timedc.tproj/m.template#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timedc.tproj/timedc.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timedc.tproj/timedc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/timed.tproj/timedc.tproj/timedc.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/traceroute.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/traceroute.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/traceroute.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/traceroute.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/traceroute.tproj/README#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/traceroute.tproj/findsaddr-socket.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/traceroute.tproj/findsaddr.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/traceroute.tproj/gnuc.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/traceroute.tproj/ifaddrlist.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/traceroute.tproj/ifaddrlist.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/traceroute.tproj/mean.awk#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/traceroute.tproj/median.awk#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/traceroute.tproj/traceroute.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/traceroute.tproj/traceroute.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/traceroute.tproj/traceroute.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/traceroute.tproj/version.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/traceroute6.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/traceroute6.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/traceroute6.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/traceroute6.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/traceroute6.tproj/traceroute6.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/traceroute6.tproj/traceroute6.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/trpt.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/trpt.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/trpt.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/trpt.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/trpt.tproj/trpt.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/trpt.tproj/trpt.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/wall.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/wall.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/wall.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/wall.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/wall.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/wall.tproj/ttymsg.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/wall.tproj/ttymsg.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/wall.tproj/wall.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/wall.tproj/wall.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypbind.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypbind.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypbind.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypbind.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypbind.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypbind.tproj/yp.x#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypbind.tproj/ypbind.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypbind.tproj/ypbind.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypcat.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypcat.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypcat.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypcat.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypcat.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypcat.tproj/ypcat.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypcat.tproj/ypcat.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypinit.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypinit.tproj/Makefile.main#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypinit.tproj/Makefile.yp#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypinit.tproj/ypinit.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypinit.tproj/ypinit.sh#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypmatch.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypmatch.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypmatch.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypmatch.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypmatch.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypmatch.tproj/ypmatch.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypmatch.tproj/ypmatch.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/yppoll.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/yppoll.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/yppoll.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/yppoll.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/yppoll.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/yppoll.tproj/yppoll.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/yppoll.tproj/yppoll.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/yppush.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/yppush.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/yppush.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/yppush.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/yppush.tproj/ypdb.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/yppush.tproj/ypdb.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/yppush.tproj/ypdef.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/yppush.tproj/yplib_host.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/yppush.tproj/yplib_host.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/yppush.tproj/yppush.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/yppush.tproj/yppush.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/yppush.tproj/yppush.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/yppush.tproj/yppush_err.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/yppush.tproj/yppush_proc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/yppush.tproj/yppush_svc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/yppush.tproj/yppush_xdr.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypserv.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypserv.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypserv.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypserv.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypserv.tproj/acl.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypserv.tproj/acl.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypserv.tproj/securenet#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypserv.tproj/securenet.5#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypserv.tproj/yp.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypserv.tproj/ypdb.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypserv.tproj/ypdb.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypserv.tproj/ypdef.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypserv.tproj/yplog.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypserv.tproj/yplog.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypserv.tproj/ypserv.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypserv.tproj/ypserv.acl#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypserv.tproj/ypserv.acl.5#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypserv.tproj/ypserv.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypserv.tproj/ypserv_db.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypserv.tproj/ypserv_proc.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypserv.tproj/ypserv_xdr.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypserv.tproj/ypserv_xdr_v1.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypserv.tproj/ypv1.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypset.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypset.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypset.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypset.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypset.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypset.tproj/ypset.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypset.tproj/ypset.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypwhich.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypwhich.tproj/Makefile.dist#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypwhich.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypwhich.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypwhich.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypwhich.tproj/ypwhich.1#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypwhich.tproj/ypwhich.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypxfr.tproj/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypxfr.tproj/Makefile.postamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypxfr.tproj/Makefile.preamble#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypxfr.tproj/PB.project#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypxfr.tproj/ypdb.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypxfr.tproj/ypdb.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypxfr.tproj/ypdef.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypxfr.tproj/yplib_host.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypxfr.tproj/yplib_host.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypxfr.tproj/yplog.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypxfr.tproj/yplog.h#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypxfr.tproj/ypxfr.8#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypxfr.tproj/ypxfr.c#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypxfr.tproj/ypxfr_1perday.sh#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypxfr.tproj/ypxfr_1perhour.sh#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypxfr.tproj/ypxfr_2perday.sh#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/network_cmds/ypxfr.tproj/ypxfr_xdr.c#1 add Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/Makefile#6 (text+ko) ==== @@ -20,6 +20,7 @@ $(MAKE) -C etc $(MAKE) -C launchd/src $(MAKE) -C netinfo/servers/notifyd + $(MAKE) -C network_cmds/ifconfig.tproj install: rm -f $(XNU)/BUILD/sym/kgmacros @@ -40,6 +41,7 @@ $(MAKE) -C etc install $(MAKE) -C launchd/src install $(MAKE) -C netinfo/servers/notifyd install + $(MAKE) -C network_cmds/ifconfig.tproj install clean: rm -rf $(XNU)/BUILD @@ -59,3 +61,4 @@ $(MAKE) -C etc clean $(MAKE) -C launchd/src clean $(MAKE) -C netinfo/servers/notifyd clean + $(MAKE) -C network_cmds/ifconfig.tproj clean From owner-p4-projects@FreeBSD.ORG Mon Jan 22 15:30:53 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17A0916A40B; Mon, 22 Jan 2007 15:30:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C682216A402 for ; Mon, 22 Jan 2007 15:30:52 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B592113C467 for ; Mon, 22 Jan 2007 15:30:52 +0000 (UTC) (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 l0MFUqpB010939 for ; Mon, 22 Jan 2007 15:30:52 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFUq6K010936 for perforce@freebsd.org; Mon, 22 Jan 2007 15:30:52 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:30:52 GMT Message-Id: <200701221530.l0MFUq6K010936@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 113326 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 15:30:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=113326 Change 113326 by millert@millert_macbook on 2007/01/22 15:30:20 Replace calls to network_label_copy() with sebsd_label_copy() now that we don't have to check for unlabeled mbufs. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#61 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#61 (text+ko) ==== @@ -154,19 +154,10 @@ } static void -network_label_copy(struct label *slabel, struct label *dlabel) +sebsd_label_copy(struct label *src, struct label *dest) { - struct network_security_struct *src, *dst; - if (slabel == NULL || dlabel == NULL) - return; - - src = SLOT(slabel); - dst = SLOT(dlabel); - if (src == NULL || dst == NULL) - return; - - *dst = *src; + *(struct sebsd_label *)SLOT(dest) = *(struct sebsd_label *)SLOT(src); } /* @@ -930,7 +921,7 @@ struct mbuf *m, struct label *mlabel) { - network_label_copy(blabel, mlabel); + sebsd_label_copy(blabel, mlabel); } static void @@ -938,7 +929,7 @@ struct mbuf *m, struct label *mlabel) { - network_label_copy(ilabel, mlabel); + sebsd_label_copy(ilabel, mlabel); } static void @@ -1137,7 +1128,7 @@ struct mbuf *m, struct label *mlabel) { - network_label_copy(solabel, mlabel); + sebsd_label_copy(solabel, mlabel); } static void @@ -1201,7 +1192,7 @@ struct xsocket *news, struct label *newslabel) { - network_label_copy(oldslabel, newslabel); + sebsd_label_copy(oldslabel, newslabel); } static int @@ -1812,7 +1803,7 @@ struct label *oldlabel, struct label *newlabel) { - network_label_copy(newlabel, oldlabel); + sebsd_label_copy(newlabel, oldlabel); } static void @@ -1853,7 +1844,7 @@ struct xsocket *xso, struct label *sopeerlabel) { - network_label_copy(mlabel, sopeerlabel); + sebsd_label_copy(mlabel, sopeerlabel); } static void @@ -1862,7 +1853,7 @@ struct label *newsockpeerlabel) { - network_label_copy(oldslabel, newsockpeerlabel); + sebsd_label_copy(oldslabel, newsockpeerlabel); } static int @@ -2926,13 +2917,6 @@ return (sebsd_externalize_sid(sid, element_name, sb)); } -static void -sebsd_label_copy(struct label *src, struct label *dest) -{ - - *(struct sebsd_label *)SLOT(dest) = *(struct sebsd_label *)SLOT(src); -} - #ifdef FD__CREATE static int sebsd_file_check_create(struct ucred *cred) @@ -3041,7 +3025,7 @@ struct label *ifnetlabel, struct label *newlabel) { - network_label_copy(newlabel, ifnetlabel); + sebsd_label_copy(newlabel, ifnetlabel); } static void @@ -3096,19 +3080,9 @@ struct network_security_struct *ifsec, *msec; int error; - if (ifnetlabel == NULL || mbuflabel == NULL) { - /* XXX - mbufs are not always labeled! */ - return (0); - } - ifsec = SLOT(ifnetlabel); msec = SLOT(mbuflabel); - if (ifsec == NULL || msec == NULL) { - /* XXX - should not happen, log and fix */ - return (0); - } - /* XXX - use an audit struct so we can log useful info */ error = avc_has_perm(msec->sid, ifsec->sid, SECCLASS_PACKET, PACKET__SEND, NULL); @@ -3504,7 +3478,7 @@ .mpo_mbuf_label_associate_bpfdesc = sebsd_mbuf_label_associate_bpfdesc, .mpo_mbuf_label_associate_ifnet = sebsd_mbuf_label_associate_ifnet, .mpo_mbuf_label_associate_socket = sebsd_mbuf_label_associate_socket, - .mpo_mbuf_label_copy = network_label_copy, + .mpo_mbuf_label_copy = sebsd_label_copy, .mpo_mbuf_label_destroy = sebsd_label_destroy, .mpo_mbuf_label_init = sebsd_label_init2, .mpo_mount_check_getattr = sebsd_mount_check_getattr, @@ -3594,7 +3568,7 @@ .mpo_socket_check_stat = sebsd_socket_check_stat, .mpo_socket_label_associate = sebsd_socket_label_associate, .mpo_socket_label_associate_accept = sebsd_socket_label_associate_accept, - .mpo_socket_label_copy = network_label_copy, + .mpo_socket_label_copy = sebsd_label_copy, .mpo_socket_label_destroy = sebsd_label_destroy, .mpo_socket_label_externalize = sebsd_label_externalize, .mpo_socket_label_init = sebsd_label_init2, From owner-p4-projects@FreeBSD.ORG Mon Jan 22 15:31:55 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D6C5816A40B; Mon, 22 Jan 2007 15:31:54 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B58C116A402 for ; Mon, 22 Jan 2007 15:31:54 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8CC7F13C4E3 for ; Mon, 22 Jan 2007 15:31:54 +0000 (UTC) (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 l0MFVs6U012438 for ; Mon, 22 Jan 2007 15:31:54 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFVsLd012428 for perforce@freebsd.org; Mon, 22 Jan 2007 15:31:54 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:31:54 GMT Message-Id: <200701221531.l0MFVsLd012428@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 113327 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 15:31:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=113327 Change 113327 by millert@millert_macbook on 2007/01/22 15:31:10 g/c unused variable Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#33 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#33 (text+ko) ==== @@ -831,7 +831,6 @@ mac_policy_unregister(mac_policy_handle_t handle) { struct mac_policy_conf *mpc; - int error; /* * If we fail the load, we may get a request to unload. Check From owner-p4-projects@FreeBSD.ORG Mon Jan 22 15:31:55 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 479C716A535; Mon, 22 Jan 2007 15:31:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0677116A4C2 for ; Mon, 22 Jan 2007 15:31:55 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E37E213C4CC for ; Mon, 22 Jan 2007 15:31:54 +0000 (UTC) (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 l0MFVs1S012460 for ; Mon, 22 Jan 2007 15:31:54 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFVsf5012444 for perforce@freebsd.org; Mon, 22 Jan 2007 15:31:54 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:31:54 GMT Message-Id: <200701221531.l0MFVsf5012444@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 113328 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 15:31:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=113328 Change 113328 by millert@millert_macbook on 2007/01/22 15:31:41 Add modification notice Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/fdesc/fdesc.h#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/fdesc/fdesc_vfsops.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/fdesc/fdesc.h#4 (text+ko) ==== @@ -67,6 +67,12 @@ * * #Id: fdesc.h,v 1.8 1993/04/06 15:28:33 jsp Exp # */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce + * 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. + */ #ifndef __FDESC_FDESC_H__ #define __FDESC_FDESC_H__ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/miscfs/fdesc/fdesc_vfsops.c#4 (text+ko) ==== @@ -66,6 +66,12 @@ * @(#)fdesc_vfsops.c 8.10 (Berkeley) 5/14/95 * */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce + * 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. + */ /* * /dev/fd Filesystem From owner-p4-projects@FreeBSD.ORG Mon Jan 22 15:32:57 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B80016A406; Mon, 22 Jan 2007 15:32:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2AF4116A403 for ; Mon, 22 Jan 2007 15:32:57 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 19D6913C4C9 for ; Mon, 22 Jan 2007 15:32:57 +0000 (UTC) (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 l0MFWujd014007 for ; Mon, 22 Jan 2007 15:32:56 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFWubj013994 for perforce@freebsd.org; Mon, 22 Jan 2007 15:32:56 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:32:56 GMT Message-Id: <200701221532.l0MFWubj013994@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 113329 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 15:32:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=113329 Change 113329 by millert@millert_macbook on 2007/01/22 15:32:45 Add mac_mbuf_label_associate_linklayer Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/ether_inet_pr_module.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/igmp.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet6/mld6.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet6/nd6.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#30 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_net.c#9 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#38 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#62 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/ether_inet_pr_module.c#4 (text+ko) ==== @@ -410,6 +410,10 @@ mbuf_prepend(&m, sizeof(*eh), MBUF_WAITOK); eh = mbuf_data(m); eh->ether_type = htons(ETHERTYPE_ARP); + +#ifdef MAC + mac_mbuf_label_associate_linklayer(ifp, m); +#endif /* Fill out the arp header */ ea->arp_pro = htons(ETHERTYPE_IP); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/igmp.c#6 (text+ko) ==== @@ -492,11 +492,9 @@ return; m->m_pkthdr.rcvif = loif; -#ifdef __darwin8_notyet #ifdef MAC mac_mbuf_label_associate_linklayer(inm->inm_ifp, m); #endif -#endif m->m_pkthdr.len = sizeof(struct ip) + IGMP_MINLEN; MH_ALIGN(m, IGMP_MINLEN + sizeof(struct ip)); m->m_data += sizeof(struct ip); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet6/mld6.c#5 (text+ko) ==== @@ -427,10 +427,8 @@ mh->m_next = md; mh->m_pkthdr.rcvif = NULL; -#ifdef __darwin8_notyet #ifdef MAC - mac_mbuf_label_associate_linklayer(in6m->in6m_ifp, m); -#endif + mac_mbuf_label_associate_linklayer(in6m->in6m_ifp, mh); #endif mh->m_pkthdr.len = sizeof(struct ip6_hdr) + sizeof(struct mld6_hdr); mh->m_len = sizeof(struct ip6_hdr); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet6/nd6.c#2 (text+ko) ==== @@ -2108,6 +2108,9 @@ m->m_pkthdr.csum_data = 0; m->m_pkthdr.csum_flags = 0; +#ifdef MAC + mac_mbuf_label_associate_linklayer(ifp, m); +#endif if ((ifp->if_flags & IFF_LOOPBACK) != 0) { m->m_pkthdr.rcvif = origifp; /* forwarding rules require the original scope_id */ if (locked) ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#30 (text+ko) ==== @@ -170,6 +170,7 @@ void mac_lctx_notify_leave(struct proc *proc, struct lctx *l); void mac_mbuf_label_associate_bpfdesc(struct bpf_d *bpf_d, struct mbuf *m); void mac_mbuf_label_associate_ifnet(struct ifnet *ifp, struct mbuf *m); +void mac_mbuf_label_associate_linklayer(struct ifnet *ifp, struct mbuf *m); void mac_mbuf_label_associate_socket(struct socket *so, struct mbuf *m); void mac_mbuf_label_copy(struct mbuf *m_from, struct mbuf *m_to); void mac_mbuf_label_destroy(struct mbuf *m); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_net.c#9 (text+ko) ==== @@ -330,6 +330,20 @@ } void +mac_mbuf_label_associate_linklayer(struct ifnet *ifp, struct mbuf *mbuf) +{ + struct label *m_label; + + /* ifp must be locked */ + + m_label = mac_mbuf_to_label(mbuf); + + /* Policy must deal with NULL label (unlabeled mbufs) */ + MAC_PERFORM(mbuf_label_associate_linklayer, ifp, ifp->if_label, mbuf, + m_label); +} + +void mac_mbuf_label_associate_socket(struct socket *socket, struct mbuf *mbuf) { struct label *label; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#38 (text+ko) ==== @@ -1216,6 +1216,24 @@ struct label *m_label ); /** + @brief Assign a label to a new mbuf + @param ifp Subject; network interface + @param i_label Existing label of ifp + @param m Object; mbuf + @param m_label Policy label to fill in for m + + Set the label on the mbuf header of a newly created datagram + generated for the purposes of a link layer response for the passed + interface. This call may be made in a number of situations, including + for ARP or ND6 responses in the IPv4 and IPv6 stacks. +*/ +typedef void mpo_mbuf_label_associate_linklayer_t( + struct ifnet *ifp, + struct label *i_label, + struct mbuf *m, + struct label *m_label +); +/** @brief Assign a label to a new mbuf @param xso Socket to label @param so_label Policy label for socket @@ -5265,6 +5283,7 @@ mpo_lctx_notify_leave_t *mpo_lctx_notify_leave; mpo_mbuf_label_associate_bpfdesc_t *mpo_mbuf_label_associate_bpfdesc; mpo_mbuf_label_associate_ifnet_t *mpo_mbuf_label_associate_ifnet; + mpo_mbuf_label_associate_linklayer_t *mpo_mbuf_label_associate_linklayer; mpo_mbuf_label_associate_socket_t *mpo_mbuf_label_associate_socket; mpo_mbuf_label_copy_t *mpo_mbuf_label_copy; mpo_mbuf_label_destroy_t *mpo_mbuf_label_destroy; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#62 (text+ko) ==== @@ -3477,6 +3477,7 @@ .mpo_ifnet_label_update = sebsd_ifnet_label_update, .mpo_mbuf_label_associate_bpfdesc = sebsd_mbuf_label_associate_bpfdesc, .mpo_mbuf_label_associate_ifnet = sebsd_mbuf_label_associate_ifnet, + .mpo_mbuf_label_associate_linklayer = sebsd_mbuf_label_associate_ifnet, .mpo_mbuf_label_associate_socket = sebsd_mbuf_label_associate_socket, .mpo_mbuf_label_copy = sebsd_label_copy, .mpo_mbuf_label_destroy = sebsd_label_destroy, From owner-p4-projects@FreeBSD.ORG Mon Jan 22 15:43:11 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F0C3816A405; Mon, 22 Jan 2007 15:43:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A742E16A401 for ; Mon, 22 Jan 2007 15:43:10 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5F5BB13C45B for ; Mon, 22 Jan 2007 15:43:10 +0000 (UTC) (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 l0MFhAcH021920 for ; Mon, 22 Jan 2007 15:43:10 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFhAHN021917 for perforce@freebsd.org; Mon, 22 Jan 2007 15:43:10 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:43:10 GMT Message-Id: <200701221543.l0MFhAHN021917@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 113330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 15:43:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=113330 Change 113330 by millert@millert_macbook on 2007/01/22 15:42:30 Minor reorg that takes into account that V_LABELED and V_LABEL are mutually exclusive. I also put a loop around the msleep() in vnode_label() and vnode_label1() to make sure that V_LABEL has really been cleared when we wake up (vnode_relabel() already did this). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs_subr.c#9 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs_subr.c#9 (text+ko) ==== @@ -36,14 +36,14 @@ return (ENOENT); } - if ((vp->v_lflag & (VL_LABEL|VL_LABELED)) == 0) { + if ((vp->v_lflag & VL_LABEL) == 0) { vp->v_lflag |= VL_LABEL; /* Could sleep on disk I/O, drop lock. */ vnode_unlock(vp); if (flags & VNODE_LABEL_CREATE) error = mac_vnode_notify_create(vfs_context_ucred(ctx), - mp, dvp, vp, cnp); + mp, dvp, vp, cnp); else error = mac_vnode_label_associate(mp, vp, ctx); vnode_lock(vp); @@ -51,30 +51,32 @@ if ((error == 0) && (vp->v_flag & VNCACHEABLE)) vp->v_lflag |= VL_LABELED; vp->v_lflag &= ~VL_LABEL; + if (vp->v_lflag & VL_LABELWAIT) { vp->v_lflag &= ~VL_LABELWAIT; wakeup(vp->v_label); } - } else - if (vp->v_lflag & VL_LABEL) { + vnode_put_locked(vp); + vnode_unlock(vp); + } else { struct timespec ts; ts.tv_sec = 10; ts.tv_nsec = 0; - vp->v_lflag |= VL_LABELWAIT; - - error = msleep(vp->v_label, &vp->v_lock, PVFS|PDROP, - "vnode_label", &ts); - if (error == EWOULDBLOCK) - vprint("vnode label timeout", vp); + while (vp->v_lflag & VL_LABEL) { + vp->v_lflag |= VL_LABELWAIT; + error = msleep(vp->v_label, &vp->v_lock, PVFS|PDROP, + "vnode_label", &ts); + if (error == EWOULDBLOCK) { + vprint("vnode label timeout", vp); + break; + } + } /* XXX: what should be done if labeling failed (above)? */ vnode_put(vp); - return (error); } - vnode_put_locked(vp); - vnode_unlock(vp); return (error); } @@ -90,11 +92,14 @@ struct vfs_context ctx; int error; + if (vp->v_lflag & VL_LABELED) + return (0); + error = 0; ctx.vc_proc = current_proc(); ctx.vc_ucred = kauth_cred_get(); - if ((vp->v_lflag & (VL_LABEL|VL_LABELED)) == 0) { + if ((vp->v_lflag & VL_LABEL) == 0) { vp->v_lflag |= VL_LABEL; /* Could sleep on disk I/O, drop lock. */ @@ -109,11 +114,13 @@ vp->v_lflag &= ~VL_LABELWAIT; wakeup(vp->v_label); } - } else - /* Wait for other labeling to complete. */ - if (vp->v_lflag & VL_LABEL) { - vp->v_lflag |= VL_LABELWAIT; - (void)msleep(vp->v_label, &vp->v_lock, PVFS, "vnode_label", 0); + } else { + /* Wait for any other labeling to complete. */ + while (vp->v_lflag & VL_LABEL) { + vp->v_lflag |= VL_LABELWAIT; + (void)msleep(vp->v_label, &vp->v_lock, PVFS, + "vnode_label1", 0); + } /* XXX: what should be done if labeling failed (above)? */ } @@ -132,7 +139,7 @@ vnode_relabel(struct vnode *vp) { - /* Wait for other labeling to complete. */ + /* Wait for any other labeling to complete. */ while (vp->v_lflag & VL_LABEL) { vp->v_lflag |= VL_LABELWAIT; (void)msleep(vp->v_label, &vp->v_lock, PVFS, "vnode_relabel", 0); From owner-p4-projects@FreeBSD.ORG Mon Jan 22 15:43:13 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C396E16A414; Mon, 22 Jan 2007 15:43:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 98A9A16A412 for ; Mon, 22 Jan 2007 15:43:13 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0FB5513C4BB for ; Mon, 22 Jan 2007 15:43:10 +0000 (UTC) (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 l0MFhAhx021930 for ; Mon, 22 Jan 2007 15:43:10 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFhAa7021923 for perforce@freebsd.org; Mon, 22 Jan 2007 15:43:10 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:43:10 GMT Message-Id: <200701221543.l0MFhAa7021923@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 113331 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 15:43:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=113331 Change 113331 by millert@millert_macbook on 2007/01/22 15:42:56 Quiet a compiler warning re: unused parameter. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_socket.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_socket.c#8 (text+ko) ==== @@ -481,7 +481,8 @@ } int -mac_socket_label_get(struct ucred *cred, struct socket *so, struct mac *mac) +mac_socket_label_get(__unused struct ucred *cred, struct socket *so, + struct mac *mac) { char *buffer, *elements; struct label *intlabel; @@ -517,7 +518,7 @@ } int -mac_socketpeer_label_get(struct ucred *cred, struct socket *so, +mac_socketpeer_label_get(__unused struct ucred *cred, struct socket *so, struct mac *mac) { char *elements, *buffer; From owner-p4-projects@FreeBSD.ORG Mon Jan 22 15:45:25 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5902B16A537; Mon, 22 Jan 2007 15:45:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DD14816A476 for ; Mon, 22 Jan 2007 15:45:24 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 40E2213C467 for ; Mon, 22 Jan 2007 15:45:14 +0000 (UTC) (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 l0MFjEKt022237 for ; Mon, 22 Jan 2007 15:45:14 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFjDUi022234 for perforce@freebsd.org; Mon, 22 Jan 2007 15:45:13 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:45:13 GMT Message-Id: <200701221545.l0MFjDUi022234@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 113332 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 15:45:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=113332 Change 113332 by millert@millert_macbook on 2007/01/22 15:44:51 Add inpcb labels so we can check labels during packet delivery; adapted from FreeBSD. Much of mac_inet.c remains commented out for now. Unlike FreeBSD, Darwin has no pru_sosetlabel so we always sync the inpcb label when the socket label changes. I believe this is safe. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/in_pcb.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/in_pcb.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_divert.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/raw_ip.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/tcp_input.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/tcp_output.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/tcp_subr.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/udp_usrreq.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/conf/files#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#31 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#39 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_socket.c#9 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#63 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/in_pcb.c#3 (text+ko) ==== @@ -191,11 +191,9 @@ { register struct inpcb *inp; caddr_t temp; -#if IPSEC -#ifndef __APPLE__ +#ifdef MAC int error; #endif -#endif if (so->cached_in_sock_layer == 0) { #if TEMPDEBUG @@ -219,12 +217,23 @@ inp->inp_gencnt = ++pcbinfo->ipi_gencnt; inp->inp_pcbinfo = pcbinfo; inp->inp_socket = so; +#ifdef MAC + error = mac_inpcb_label_init(inp, M_WAITOK); + if (error != 0) { + if (so->cached_in_sock_layer == 0) + zfree(pcbinfo->ipi_zone, inp); + return (error); + } + mac_inpcb_label_associate(so, inp); +#endif so->so_pcb = (caddr_t)inp; if (so->so_proto->pr_flags & PR_PCBLOCK) { inp->inpcb_mtx = lck_mtx_alloc_init(pcbinfo->mtx_grp, pcbinfo->mtx_attr); if (inp->inpcb_mtx == NULL) { printf("in_pcballoc: can't alloc mutex! so=%x\n", so); + if (so->cached_in_sock_layer == 0) + zfree(pcbinfo->ipi_zone, inp); return(ENOMEM); } } @@ -793,6 +802,9 @@ so->so_pcb = 0; inp->inp_socket = 0; inp->reserved[0] = so; +#ifdef MAC + mac_inpcb_label_destroy(inp); +#endif if (so->cached_in_sock_layer == 0) { zfree(ipi->ipi_zone, inp); } @@ -1686,6 +1698,9 @@ struct proc *p = current_proc(); bzero(&pcbinfo->nat_dummy_socket, sizeof(struct socket)); +#ifdef MAC + mac_socket_label_init(&pcbinfo->nat_dummy_socket, M_WAITOK); +#endif pcbinfo->nat_dummy_socket.so_proto = pffindproto_locked(afamily, pfamily, protocol); pcbinfo->all_owners = 0; stat = in_pcballoc(&pcbinfo->nat_dummy_socket, pcbinfo, p); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/in_pcb.h#3 (text+ko) ==== @@ -75,8 +75,6 @@ #endif #endif /* KERNEL_PRIVATE */ -#include /* for IPSEC */ - #ifdef KERNEL_PRIVATE #define in6pcb inpcb /* for KAME src sync over BSD*'s */ @@ -185,7 +183,8 @@ #else void *inpcb_mtx; #endif - u_long reserved[2]; /* For future use */ + struct label *inp_label; /* MAC label */ + u_long reserved[1]; /* For future use */ }; #endif /* KERNEL_PRIVATE */ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_divert.c#3 (text+ko) ==== @@ -370,6 +370,9 @@ /* Send packet to output processing */ ipstat.ips_rawout++; /* XXX */ socket_unlock(so, 0); +#ifdef MAC + mac_mbuf_label_associate_inpcb(inp, m); +#endif error = ip_output(m, inp->inp_options, &inp->inp_route, (so->so_options & SO_DONTROUTE) | @@ -420,6 +423,9 @@ ip->ip_sum = in_cksum(m, hlen); } +#ifdef MAC + mac_mbuf_label_associate_socket(so, m); +#endif /* Send packet to input processing */ proto_inject(PF_INET, m); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/raw_ip.c#6 (text+ko) ==== @@ -226,7 +226,13 @@ lck_mtx_unlock(sadb_mutex); } #endif /*IPSEC*/ +#ifdef MAC if (n && skipit == 0) { + if (mac_inpcb_check_deliver(last, n) != 0) + skipit = 1; + } +#endif + if (n && skipit == 0) { int error = 0; if (last->inp_flags & INP_CONTROLOPTS || last->inp_socket->so_options & SO_TIMESTAMP) @@ -269,6 +275,12 @@ lck_mtx_unlock(sadb_mutex); } #endif /*IPSEC*/ +#ifdef MAC + if (last && skipit == 0) { + if (mac_inpcb_check_deliver(last, m) != 0) + skipit = 1; + } +#endif if (skipit == 0) { if (last) { if (last->inp_flags & INP_CONTROLOPTS || @@ -364,7 +376,7 @@ } #ifdef MAC_SOCKET - mac_mbuf_label_associate_socket(so, m); + mac_mbuf_label_associate_inpcb(inp, m); #endif return (ip_output_list(m, 0, inp->inp_options, &inp->inp_route, flags, ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/tcp_input.c#6 (text+ko) ==== @@ -911,8 +911,7 @@ tiwin = th->th_win; #ifdef MAC_SOCKET - /* XXXMAC: should be mac_inpcb_check_deliver() */ - if (mac_socket_check_deliver(so, m)) + if (mac_inpcb_check_deliver(inp, m)) goto drop; #endif ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/tcp_output.c#6 (text+ko) ==== @@ -1006,11 +1006,7 @@ } m->m_pkthdr.rcvif = 0; #ifdef MAC_SOCKET -#ifdef __darwin8_notyet - mac_inpcb_create_mbuf(tp->t_inpcb, m); -#else - mac_mbuf_label_associate_socket(so, m); -#endif + mac_mbuf_label_associate_inpcb(tp->t_inpcb, m); #endif #if INET6 if (isipv6) { ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/tcp_subr.c#6 (text+ko) ==== @@ -581,12 +581,7 @@ * Packet is associated with a socket, so allow the * label of the response to reflect the socket label. */ -#ifdef __darwin8_notyet - INP_LOCK_ASSERT(inp); - mac_inpcb_create_mbuf(tp->t_inpcb, m); -#else - mac_mbuf_label_associate_socket(tp->t_inpcb->inp_socket, m); -#endif + mac_mbuf_label_associate_inpcb(tp->t_inpcb, m); } else { #ifdef __darwin8_notyet /* ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/udp_usrreq.c#3 (text+ko) ==== @@ -696,6 +696,12 @@ struct sockaddr *append_sa; struct mbuf *opts = 0; +#ifdef MAC + if (mac_inpcb_check_deliver(last, n) != 0) { + m_freem(n); + return; + } +#endif if (last->inp_flags & INP_CONTROLOPTS || last->inp_socket->so_options & SO_TIMESTAMP) { #if INET6 @@ -1006,6 +1012,9 @@ } } +#ifdef MAC + mac_mbuf_label_associate_inpcb(inp, m); +#endif /* * Calculate data length and get a mbuf ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/conf/files#4 (text+ko) ==== @@ -25,3 +25,4 @@ security/mac_pipe.c optional mac security/mac_iokit.c optional mac security/mac_file.c optional mac +security/mac_inet.c optional mac ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#31 (text+ko) ==== @@ -1,7 +1,7 @@ /*- * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001-2005 Networks Associates Technology, Inc. - * Copyright (c) 2005-2006 SPARTA, Inc. + * Copyright (c) 2005-2007 SPARTA, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -60,6 +60,7 @@ struct fdescnode; struct fileglob; struct ifnet; +struct inpcb; struct ifreq; struct lctx; struct mac; @@ -160,8 +161,12 @@ void mac_ifnet_label_recycle(struct ifnet *ifp); int mac_ifnet_label_set(struct ucred *cred, struct ifreq *ifr, struct ifnet *ifp); -int mac_iokit_check_device(char *devtype, struct mac_module_data *mdata); -int mac_lctx_check_label_update(struct lctx *l, struct label *newlabel); +int mac_inpcb_check_deliver(struct inpcb *inp, struct mbuf *mbuf); +void mac_inpcb_label_associate(struct socket *so, struct inpcb *inp); +void mac_inpcb_label_destroy(struct inpcb *inp); +int mac_inpcb_label_init(struct inpcb *inp, int flag); +void mac_inpcb_label_recycle(struct inpcb *inp); +void mac_inpcb_label_update(struct socket *so); struct label *mac_lctx_label_alloc(void); void mac_lctx_label_free(struct label *label); void mac_lctx_label_update(struct lctx *l, struct label *newlabel); @@ -170,6 +175,7 @@ void mac_lctx_notify_leave(struct proc *proc, struct lctx *l); void mac_mbuf_label_associate_bpfdesc(struct bpf_d *bpf_d, struct mbuf *m); void mac_mbuf_label_associate_ifnet(struct ifnet *ifp, struct mbuf *m); +void mac_mbuf_label_associate_inpcb(struct inpcb *inp, struct mbuf *m); void mac_mbuf_label_associate_linklayer(struct ifnet *ifp, struct mbuf *m); void mac_mbuf_label_associate_socket(struct socket *so, struct mbuf *m); void mac_mbuf_label_copy(struct mbuf *m_from, struct mbuf *m_to); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#39 (text+ko) ==== @@ -1,7 +1,7 @@ /*- * Copyright (c) 1999-2002 Robert N. M. Watson * Copyright (c) 2001-2005 Networks Associates Technology, Inc. - * Copyright (c) 2005-2006 SPARTA, Inc. + * Copyright (c) 2005-2007 SPARTA, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -61,6 +61,7 @@ struct devnode; struct fileglob; struct ifnet; +struct inpcb; struct label; struct lctx; struct mac_module_data; @@ -1005,6 +1006,84 @@ struct label *label ); /** + @brief Access control check for delivering a packet to a socket + @param inp inpcb the socket is associated with + @param inplabel Label of the inpcb + @param m The mbuf being received + @param mbuflabel Label of the mbuf being received + + Determine whether the mbuf with label mbuflabel may be received + by the socket associated with inpcb that has the label inplabel. + + @return Return 0 if access is granted, otherwise an appropriate value for + errno should be returned. +*/ +typedef int mpo_inpcb_check_deliver_t( + struct inpcb *inp, + struct label *inplabel, + struct mbuf *m, + struct label *mbuflabel +); +/** + @brief Create an inpcb label + @param so Socket containing the inpcb to be labeled + @param solabel Label of the socket + @param inp inpcb to be labeled + @param inplabel Label for the inpcb + + Set the label of a newly created inpcb, most likely + using the information in the socket and/or socket label. +*/ +typedef void mpo_inpcb_label_associate_t( + struct socket *so, + struct label *solabel, + struct inpcb *inp, + struct label *inplabel +); +/** + @brief Destroy inpcb label + @param label The label to be destroyed +*/ +typedef void mpo_inpcb_label_destroy_t( + struct label *label +); +/** + @brief Initialize inpcb label + @param label New label to initialize + @param flag M_WAITOK or M_NOWAIT +*/ +typedef int mpo_inpcb_label_init_t( + struct label *label, + int flag +); +/** + @brief Recycle up an inpcb label + @param label The label to be recycled + + Recycle an inpcb label. Darwin allocates the inpcb as part of + the socket structure in some cases. For this case we must recycle + rather than destroy the inpcb as it will be reused later. +*/ +typedef void mpo_inpcb_label_recycle_t( + struct label *label +); +/** + @brief Update an inpcb label from a socket label + @param so Socket containing the inpcb to be relabeled + @param solabel New label of the socket + @param inp inpcb to be labeled + @param inplabel Label for the inpcb + + Set the label of a newly created inpcb due to a change in the + underlying socket label. +*/ +typedef void mpo_inpcb_label_update_t( + struct socket *so, + struct label *solabel, + struct inpcb *inp, + struct label *inplabel +); +/** @brief Update a network interface label @param cred Subject credential @param ifp The network interface to be relabeled @@ -1217,6 +1296,21 @@ ); /** @brief Assign a label to a new mbuf + @param inp inpcb structure + @param i_label Existing label of inp + @param m Object; mbuf + @param m_label Policy label to fill in for m + + Label an mbuf based on the inpcb from which it was derived. +*/ +typedef void mpo_mbuf_label_associate_inpcb_t( + struct inpcb *inp, + struct label *i_label, + struct mbuf *m, + struct label *m_label +); +/** + @brief Assign a label to a new mbuf @param ifp Subject; network interface @param i_label Existing label of ifp @param m Object; mbuf @@ -5271,6 +5365,12 @@ mpo_ifnet_label_internalize_t *mpo_ifnet_label_internalize; mpo_ifnet_label_update_t *mpo_ifnet_label_update; mpo_ifnet_label_recycle_t *mpo_ifnet_label_recycle; + mpo_inpcb_check_deliver_t *mpo_inpcb_check_deliver; + mpo_inpcb_label_associate_t *mpo_inpcb_label_associate; + mpo_inpcb_label_destroy_t *mpo_inpcb_label_destroy; + mpo_inpcb_label_init_t *mpo_inpcb_label_init; + mpo_inpcb_label_recycle_t *mpo_inpcb_label_recycle; + mpo_inpcb_label_update_t *mpo_inpcb_label_update; mpo_iokit_check_device_t *mpo_iokit_check_device; mpo_lctx_check_label_update_t *mpo_lctx_check_label_update; mpo_lctx_label_destroy_t *mpo_lctx_label_destroy; @@ -5283,6 +5383,7 @@ mpo_lctx_notify_leave_t *mpo_lctx_notify_leave; mpo_mbuf_label_associate_bpfdesc_t *mpo_mbuf_label_associate_bpfdesc; mpo_mbuf_label_associate_ifnet_t *mpo_mbuf_label_associate_ifnet; + mpo_mbuf_label_associate_inpcb_t *mpo_mbuf_label_associate_inpcb; mpo_mbuf_label_associate_linklayer_t *mpo_mbuf_label_associate_linklayer; mpo_mbuf_label_associate_socket_t *mpo_mbuf_label_associate_socket; mpo_mbuf_label_copy_t *mpo_mbuf_label_copy; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_socket.c#9 (text+ko) ==== @@ -434,16 +434,14 @@ sotoxsocket(so, &xso); MAC_PERFORM(socket_label_update, cred, &xso, so->so_label, label); -#ifdef __darwin8_notyet /* * If the protocol has expressed interest in socket layer changes, * such as if it needs to propagate changes to a cached pcb * label from the socket, notify it of the label change while * holding the socket lock. + * XXXMAC - are there cases when we should not do this? */ - if (so->so_proto->pr_usrreqs->pru_sosetlabel != NULL) - (so->so_proto->pr_usrreqs->pru_sosetlabel)(so); -#endif + mac_inpcb_label_update(so); return (0); } ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#63 (text+ko) ==== @@ -933,6 +933,14 @@ } static void +sebsd_mbuf_label_associate_inpcb(struct inpcb *inp, struct label *ilabel, + struct mbuf *m, struct label *mlabel) +{ + + sebsd_label_copy(ilabel, mlabel); +} + +static void sebsd_posixsem_label_associate(struct ucred *cred, struct pseminfo *psem, struct label *psemlabel, const char *name) { @@ -2651,9 +2659,8 @@ struct label *socklabel) { - /* XXX - check for NULL mbuf label */ - /* XXX what to use here? */ - return (socket_has_perm(cred, socklabel, SOCKET__DELIVER)); + /* XXX - check for NULL socket label? */ + return (socket_has_perm(cred, socklabel, SOCKET__RECV)); } #endif @@ -3089,6 +3096,38 @@ return (error); } +static void +sebsd_inpcb_label_associate(struct socket *so, struct label *solabel, + struct inpcb *inp, struct label *inplabel) +{ + + sebsd_label_copy(solabel, inplabel); +} + +static void +sebsd_inpcb_label_update(struct socket *so, struct label *solabel, + struct inpcb *inp, struct label *inplabel) +{ + + sebsd_label_copy(solabel, inplabel); +} + +static int +sebsd_inpcb_check_deliver(struct inpcb *inp, + struct label *inplabel, struct mbuf *m, struct label *mbuflabel) +{ + struct network_security_struct *ifsec, *msec; + int error; + + ifsec = SLOT(inplabel); + msec = SLOT(mbuflabel); + + /* XXX - use an audit struct so we can log useful info */ + error = avc_has_perm(msec->sid, ifsec->sid, SECCLASS_PACKET, + PACKET__RECV, NULL); + return (error); +} + static int ipc_has_perm(struct ucred *cred, struct label *label, u_int32_t perm) { @@ -3475,8 +3514,15 @@ .mpo_ifnet_label_internalize = sebsd_label_internalize, .mpo_ifnet_label_recycle = sebsd_label_recycle, .mpo_ifnet_label_update = sebsd_ifnet_label_update, + .mpo_inpcb_check_deliver = sebsd_inpcb_check_deliver, + .mpo_inpcb_label_associate = sebsd_inpcb_label_associate, + .mpo_inpcb_label_destroy = sebsd_label_destroy, + .mpo_inpcb_label_init = sebsd_label_init2, + .mpo_inpcb_label_recycle = sebsd_label_recycle, + .mpo_inpcb_label_update = sebsd_inpcb_label_update, .mpo_mbuf_label_associate_bpfdesc = sebsd_mbuf_label_associate_bpfdesc, .mpo_mbuf_label_associate_ifnet = sebsd_mbuf_label_associate_ifnet, + .mpo_mbuf_label_associate_inpcb = sebsd_mbuf_label_associate_inpcb, .mpo_mbuf_label_associate_linklayer = sebsd_mbuf_label_associate_ifnet, .mpo_mbuf_label_associate_socket = sebsd_mbuf_label_associate_socket, .mpo_mbuf_label_copy = sebsd_label_copy, From owner-p4-projects@FreeBSD.ORG Mon Jan 22 15:46:16 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BEFDF16A403; Mon, 22 Jan 2007 15:46:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7DB1B16A401 for ; Mon, 22 Jan 2007 15:46:16 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6BDE313C469 for ; Mon, 22 Jan 2007 15:46:16 +0000 (UTC) (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 l0MFkGsT022315 for ; Mon, 22 Jan 2007 15:46:16 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFkFhZ022310 for perforce@freebsd.org; Mon, 22 Jan 2007 15:46:15 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:46:15 GMT Message-Id: <200701221546.l0MFkFhZ022310@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 113333 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 15:46:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=113333 Change 113333 by millert@millert_macbook on 2007/01/22 15:45:28 Add mac_mbuf_label_associate_netlayer(). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_icmp.c#7 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#32 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_net.c#10 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#40 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#64 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_icmp.c#7 (text+ko) ==== @@ -231,11 +231,9 @@ m->m_flags |= M_SKIP_FIREWALL; } -#ifdef __darwin8_notyet #ifdef MAC mac_mbuf_label_associate_netlayer(n, m); #endif -#endif icmplen = min(oiplen + 8, oip->ip_len); if (icmplen < sizeof(struct ip)) { printf("icmp_error: bad length\n"); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#32 (text+ko) ==== @@ -177,6 +177,8 @@ void mac_mbuf_label_associate_ifnet(struct ifnet *ifp, struct mbuf *m); void mac_mbuf_label_associate_inpcb(struct inpcb *inp, struct mbuf *m); void mac_mbuf_label_associate_linklayer(struct ifnet *ifp, struct mbuf *m); +void mac_mbuf_label_associate_netlayer(struct mbuf *oldmbuf, + struct mbuf *newmbuf); void mac_mbuf_label_associate_socket(struct socket *so, struct mbuf *m); void mac_mbuf_label_copy(struct mbuf *m_from, struct mbuf *m_to); void mac_mbuf_label_destroy(struct mbuf *m); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_net.c#10 (text+ko) ==== @@ -310,7 +310,6 @@ m_label = mac_mbuf_to_label(mbuf); b_label = mac_bpfdesc_label_get(bpf_d); - /* Policy must deal with NULL label (unlabeled mbufs) */ MAC_PERFORM(mbuf_label_associate_bpfdesc, bpf_d, b_label, mbuf, m_label); } @@ -324,7 +323,6 @@ m_label = mac_mbuf_to_label(mbuf); - /* Policy must deal with NULL label (unlabeled mbufs) */ MAC_PERFORM(mbuf_label_associate_ifnet, ifp, ifp->if_label, mbuf, m_label); } @@ -338,12 +336,23 @@ m_label = mac_mbuf_to_label(mbuf); - /* Policy must deal with NULL label (unlabeled mbufs) */ MAC_PERFORM(mbuf_label_associate_linklayer, ifp, ifp->if_label, mbuf, m_label); } void +mac_mbuf_label_associate_netlayer(struct mbuf *oldmbuf, struct mbuf *newmbuf) +{ + struct label *oldmbuflabel, *newmbuflabel; + + oldmbuflabel = mac_mbuf_to_label(oldmbuf); + newmbuflabel = mac_mbuf_to_label(newmbuf); + + MAC_PERFORM(mbuf_label_associate_netlayer, oldmbuf, oldmbuflabel, + newmbuf, newmbuflabel); +} + +void mac_mbuf_label_associate_socket(struct socket *socket, struct mbuf *mbuf) { struct label *label; @@ -353,7 +362,6 @@ label = mac_mbuf_to_label(mbuf); - /* Policy must deal with NULL label (unlabeled mbufs) */ sotoxsocket(socket, &xso); MAC_PERFORM(mbuf_label_associate_socket, &xso, socket->so_label, mbuf, label); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#40 (text+ko) ==== @@ -1328,6 +1328,24 @@ struct label *m_label ); /** + @brief Assign a label to a new mbuf + @param oldmbuf Received datagram + @param oldmbuflabel Policy label for oldmbuf + @param newmbuf Newly created datagram + @param newmbuflabel Policy label for newmbuf + + Set the label on the mbuf header of a newly created datagram generated + by the IP stack in response to an existing received datagram (oldmbuf). + This call may be made in a number of situations, including when responding + to ICMP request datagrams. +*/ +typedef void mpo_mbuf_label_associate_netlayer_t( + struct mbuf *oldmbuf, + struct label *oldmbuflabel, + struct mbuf *newmbuf, + struct label *newmbuflabel +); +/** @brief Assign a label to a new mbuf @param xso Socket to label @param so_label Policy label for socket @@ -5385,6 +5403,7 @@ mpo_mbuf_label_associate_ifnet_t *mpo_mbuf_label_associate_ifnet; mpo_mbuf_label_associate_inpcb_t *mpo_mbuf_label_associate_inpcb; mpo_mbuf_label_associate_linklayer_t *mpo_mbuf_label_associate_linklayer; + mpo_mbuf_label_associate_netlayer_t *mpo_mbuf_label_associate_netlayer; mpo_mbuf_label_associate_socket_t *mpo_mbuf_label_associate_socket; mpo_mbuf_label_copy_t *mpo_mbuf_label_copy; mpo_mbuf_label_destroy_t *mpo_mbuf_label_destroy; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#64 (text+ko) ==== @@ -933,6 +933,15 @@ } static void +sebsd_mbuf_label_associate_netlayer(struct mbuf *oldmbuf, + struct label *oldmbuflabel, struct mbuf *newmbuf, + struct label *newmbuflabel) +{ + + sebsd_label_copy(oldmbuflabel, newmbuflabel); +} + +static void sebsd_mbuf_label_associate_inpcb(struct inpcb *inp, struct label *ilabel, struct mbuf *m, struct label *mlabel) { @@ -3524,6 +3533,7 @@ .mpo_mbuf_label_associate_ifnet = sebsd_mbuf_label_associate_ifnet, .mpo_mbuf_label_associate_inpcb = sebsd_mbuf_label_associate_inpcb, .mpo_mbuf_label_associate_linklayer = sebsd_mbuf_label_associate_ifnet, + .mpo_mbuf_label_associate_netlayer = sebsd_mbuf_label_associate_netlayer, .mpo_mbuf_label_associate_socket = sebsd_mbuf_label_associate_socket, .mpo_mbuf_label_copy = sebsd_label_copy, .mpo_mbuf_label_destroy = sebsd_label_destroy, From owner-p4-projects@FreeBSD.ORG Mon Jan 22 15:51:23 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B585C16A403; Mon, 22 Jan 2007 15:51:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 749E616A402 for ; Mon, 22 Jan 2007 15:51:23 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4B97213C428 for ; Mon, 22 Jan 2007 15:51:23 +0000 (UTC) (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 l0MFpNkp023064 for ; Mon, 22 Jan 2007 15:51:23 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFpN6e023061 for perforce@freebsd.org; Mon, 22 Jan 2007 15:51:23 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:51:23 GMT Message-Id: <200701221551.l0MFpN6e023061@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 113334 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 15:51:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=113334 Change 113334 by millert@millert_macbook on 2007/01/22 15:51:22 Port mac_inet.c from FreeBSD. Currently, only the inpcb functions are enabled. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_inet.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jan 22 15:53:27 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36C7016A404; Mon, 22 Jan 2007 15:53:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EB81C16A402 for ; Mon, 22 Jan 2007 15:53:26 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DA06513C44B for ; Mon, 22 Jan 2007 15:53:26 +0000 (UTC) (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 l0MFrQ4Q023763 for ; Mon, 22 Jan 2007 15:53:26 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFrQhg023759 for perforce@freebsd.org; Mon, 22 Jan 2007 15:53:26 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:53:26 GMT Message-Id: <200701221553.l0MFrQhg023759@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 113335 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 15:53:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=113335 Change 113335 by millert@millert_macbook on 2007/01/22 15:52:26 Implement mac_netinet_icmp_reply(), mac_netinet_fragment(), and mac_netinet_tcp_reply(). These entry point should be renamed to better match the current naming scheme. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_icmp.c#8 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_output.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/tcp_subr.c#7 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#33 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_inet.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#41 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#65 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_icmp.c#8 (text+ko) ==== @@ -730,11 +730,9 @@ ifaref(&ia->ia_ifa); } lck_mtx_unlock(rt_mtx); -#ifdef __darwin8_notyet #ifdef MAC mac_netinet_icmp_reply(m); #endif -#endif t = IA_SIN(ia)->sin_addr; ip->ip_src = t; ip->ip_ttl = ip_defttl; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_output.c#6 (text+ko) ==== @@ -1293,11 +1293,9 @@ m->m_pkthdr.rcvif = 0; m->m_pkthdr.csum_flags = m0->m_pkthdr.csum_flags; m->m_pkthdr.socket_id = m0->m_pkthdr.socket_id; -#ifdef __darwin8_notyet #ifdef MAC mac_netinet_fragment(m0, m); #endif -#endif HTONS(mhip->ip_off); mhip->ip_sum = 0; if (sw_csum & CSUM_DELAY_IP) { ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/tcp_subr.c#7 (text+ko) ==== @@ -583,13 +583,11 @@ */ mac_mbuf_label_associate_inpcb(tp->t_inpcb, m); } else { -#ifdef __darwin8_notyet /* * Packet is not associated with a socket, so possibly * update the label in place. */ mac_netinet_tcp_reply(m); -#endif } #endif nth->th_seq = htonl(seq); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#33 (text+ko) ==== @@ -205,6 +205,9 @@ int mac_mount_label_get(struct mount *mp, user_addr_t mac_p); void mac_mount_label_init(struct mount *); int mac_mount_label_internalize(struct label *, char *string); +void mac_netinet_fragment(struct mbuf *datagram, struct mbuf *fragment); +void mac_netinet_icmp_reply(struct mbuf *m); +void mac_netinet_tcp_reply(struct mbuf *m); int mac_pipe_check_ioctl(struct ucred *cred, struct pipe *cpipe, unsigned int cmd); int mac_pipe_check_kqfilter(struct ucred *cred, struct knote *kn, ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_inet.c#2 (text+ko) ==== @@ -173,6 +173,7 @@ MAC_PERFORM(ipq_reassemble, ipq, ipq->ipq_label, datagram, label); } +#endif void mac_netinet_fragment(struct mbuf *datagram, struct mbuf *fragment) @@ -186,6 +187,7 @@ fragmentlabel); } +#ifdef notyet void mac_ipq_label_associate(struct mbuf *fragment, struct ipq *ipq) { @@ -222,6 +224,7 @@ return (result); } +#endif void mac_netinet_icmp_reply(struct mbuf *m) @@ -243,6 +246,7 @@ MAC_PERFORM(netinet_tcp_reply, m, label); } +#ifdef notyet void mac_ipq_update(struct mbuf *fragment, struct ipq *ipq) { ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#41 (text+ko) ==== @@ -1656,6 +1656,47 @@ char *element_data ); /** + @brief Set the label on an IPv4 datagram fragment + @param datagram Datagram being fragmented + @param datagramlabel Policy label for datagram + @param fragment New fragment + @param fragmentlabel Policy label for fragment + + Called when an IPv4 datagram is fragmented into several smaller datagrams. + Policies implementing mbuf labels will typically copy the label from the + source datagram to the new fragment. +*/ +typedef void mpo_netinet_fragment_t( + struct mbuf *datagram, + struct label *datagramlabel, + struct mbuf *fragment, + struct label *fragmentlabel +); +/** + @brief Set the label on an ICMP reply + @param m mbuf containing the ICMP reply + @param mlabel Policy label for m + + A policy may wish to update the label of an mbuf that refers to + an ICMP packet being sent in response to an IP packet. This may + be called in response to a bad packet or an ICMP request. +*/ +typedef void mpo_netinet_icmp_reply_t( + struct mbuf *m, + struct label *mlabel +); +/** + @brief Set the label on a TCP reply + @param m mbuf containing the TCP reply + @param mlabel Policy label for m + + Called for outgoing TCP packets not associated with an actual socket. +*/ +typedef void mpo_netinet_tcp_reply_t( + struct mbuf *m, + struct label *mlabel +); +/** @brief Access control check for pipe ioctl @param cred Subject credential @param cpipe Object to be accessed @@ -5421,6 +5462,9 @@ mpo_mount_label_externalize_t *mpo_mount_label_externalize; mpo_mount_label_init_t *mpo_mount_label_init; mpo_mount_label_internalize_t *mpo_mount_label_internalize; + mpo_netinet_fragment_t *mpo_netinet_fragment; + mpo_netinet_icmp_reply_t *mpo_netinet_icmp_reply; + mpo_netinet_tcp_reply_t *mpo_netinet_tcp_reply; mpo_pipe_check_ioctl_t *mpo_pipe_check_ioctl; mpo_pipe_check_kqfilter_t *mpo_pipe_check_kqfilter; mpo_pipe_check_label_update_t *mpo_pipe_check_label_update; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#65 (text+ko) ==== @@ -3137,6 +3137,14 @@ return (error); } +static void +sebsd_netinet_fragment(struct mbuf *mbuf, struct label *mlabel, + struct mbuf *frag, struct label *flabel) +{ + + sebsd_label_copy(mlabel, flabel); +} + static int ipc_has_perm(struct ucred *cred, struct label *label, u_int32_t perm) { @@ -3552,6 +3560,7 @@ .mpo_mount_label_externalize = sebsd_label_externalize, .mpo_mount_label_init = sebsd_label_init, .mpo_mount_label_internalize = sebsd_label_internalize, + .mpo_netinet_fragment = sebsd_netinet_fragment, .mpo_pipe_check_ioctl = sebsd_pipe_check_ioctl, .mpo_pipe_check_label_update = sebsd_pipe_check_label_update, .mpo_pipe_check_read = sebsd_pipe_check_read, From owner-p4-projects@FreeBSD.ORG Mon Jan 22 15:53:27 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BB8116A4F8; Mon, 22 Jan 2007 15:53:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4E61516A475 for ; Mon, 22 Jan 2007 15:53:27 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3AFB913C44C for ; Mon, 22 Jan 2007 15:53:27 +0000 (UTC) (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 l0MFrRXe023771 for ; Mon, 22 Jan 2007 15:53:27 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFrQWk023767 for perforce@freebsd.org; Mon, 22 Jan 2007 15:53:26 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:53:26 GMT Message-Id: <200701221553.l0MFrQWk023767@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 113336 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 15:53:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=113336 Change 113336 by millert@millert_macbook on 2007/01/22 15:52:46 Implement mpo_socket_check_deliver, which is similar to mpo_inpcb_check_deliver (but for protocols w/o an inpcb). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#66 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#66 (text+ko) ==== @@ -2662,16 +2662,21 @@ SOCKET__CREATE, NULL)); } -#if 0 static int -sebsd_socket_check_deliver(struct ucred *cred, struct xsocket *xso, - struct label *socklabel) +sebsd_socket_check_deliver(struct xsocket *xso, struct label *socklabel, + struct mbuf *m, struct label *mbuflabel) { + struct network_security_struct *nsec, *msec; + int error; + + nsec = SLOT(socklabel); + msec = SLOT(mbuflabel); - /* XXX - check for NULL socket label? */ - return (socket_has_perm(cred, socklabel, SOCKET__RECV)); + /* XXX - use an audit struct so we can log useful info */ + error = avc_has_perm(msec->sid, nsec->sid, SECCLASS_PACKET, + PACKET__RECV, NULL); + return (error); } -#endif #ifdef SOCKET__POLL static int @@ -3627,6 +3632,7 @@ .mpo_socket_check_bind = sebsd_socket_check_bind, .mpo_socket_check_connect = sebsd_socket_check_connect, .mpo_socket_check_create = sebsd_socket_check_create, + .mpo_socket_check_deliver = sebsd_socket_check_deliver, .mpo_socket_check_label_update = sebsd_socket_check_label_update, .mpo_socket_check_listen = sebsd_socket_check_listen, .mpo_socket_check_receive = sebsd_socket_check_receive, From owner-p4-projects@FreeBSD.ORG Mon Jan 22 15:53:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CDF4516A54E; Mon, 22 Jan 2007 15:53:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A4A4D16A55A for ; Mon, 22 Jan 2007 15:53:27 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9107813C455 for ; Mon, 22 Jan 2007 15:53:27 +0000 (UTC) (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 l0MFrRgD023778 for ; Mon, 22 Jan 2007 15:53:27 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFrRfK023774 for perforce@freebsd.org; Mon, 22 Jan 2007 15:53:27 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:53:27 GMT Message-Id: <200701221553.l0MFrRfK023774@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 113337 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 15:53:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=113337 Change 113337 by millert@millert_macbook on 2007/01/22 15:53:19 Fix sorting error. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#42 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#42 (text+ko) ==== @@ -1006,6 +1006,22 @@ struct label *label ); /** + @brief Update a network interface label + @param cred Subject credential + @param ifp The network interface to be relabeled + @param ifnetlabel The current label of the network interface + @param newlabel A new label to apply to the network interface + @see mpo_ifnet_check_label_update_t + + Update the label on a network interface, using the supplied new label. +*/ +typedef void mpo_ifnet_label_update_t( + struct ucred *cred, + struct ifnet *ifp, + struct label *ifnetlabel, + struct label *newlabel +); +/** @brief Access control check for delivering a packet to a socket @param inp inpcb the socket is associated with @param inplabel Label of the inpcb @@ -1084,22 +1100,6 @@ struct label *inplabel ); /** - @brief Update a network interface label - @param cred Subject credential - @param ifp The network interface to be relabeled - @param ifnetlabel The current label of the network interface - @param newlabel A new label to apply to the network interface - @see mpo_ifnet_check_label_update_t - - Update the label on a network interface, using the supplied new label. -*/ -typedef void mpo_ifnet_label_update_t( - struct ucred *cred, - struct ifnet *ifp, - struct label *ifnetlabel, - struct label *newlabel -); -/** @brief Device hardware access control @param devtype Type of device connected @param properties XML-formatted property list From owner-p4-projects@FreeBSD.ORG Mon Jan 22 15:55:37 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2931616A55B; Mon, 22 Jan 2007 15:55:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A900616A5A1 for ; Mon, 22 Jan 2007 15:55:36 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A1C9413C4BD for ; Mon, 22 Jan 2007 15:55:30 +0000 (UTC) (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 l0MFtUSU024310 for ; Mon, 22 Jan 2007 15:55:30 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFtUvT024307 for perforce@freebsd.org; Mon, 22 Jan 2007 15:55:30 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:55:30 GMT Message-Id: <200701221555.l0MFtUvT024307@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 113338 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 15:55:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=113338 Change 113338 by millert@millert_macbook on 2007/01/22 15:54:30 Add IP fragment queue labeling; adapted from FreeBSD. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_input.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_var.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#34 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_inet.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#43 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#67 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_input.c#4 (text+ko) ==== @@ -1000,6 +1000,9 @@ if (ip->ip_id == fp->ipq_id && ip->ip_src.s_addr == fp->ipq_src.s_addr && ip->ip_dst.s_addr == fp->ipq_dst.s_addr && +#ifdef MAC + mac_ipq_label_compare(m, fp) && +#endif ip->ip_p == fp->ipq_p) goto found; @@ -1222,6 +1225,14 @@ if ((t = m_get(M_DONTWAIT, MT_FTABLE)) == NULL) goto dropfrag; fp = mtod(t, struct ipq *); +#ifdef MAC + if (mac_ipq_label_init(fp, M_NOWAIT) != 0) { + m_free(t); + fp = NULL; + goto dropfrag; + } + mac_ipq_label_associate(m, fp); +#endif insque((void*)fp, (void*)where); nipq++; fp->ipq_nfrags = 1; @@ -1244,6 +1255,9 @@ goto inserted; } else { fp->ipq_nfrags++; +#ifdef MAC + mac_ipq_label_update(m, fp); +#endif } #define GETIP(m) ((struct ip*)((m)->m_pkthdr.header)) @@ -1398,6 +1412,10 @@ *divcookie = fp->ipq_div_cookie; #endif +#ifdef MAC + mac_mbuf_label_associate_ipq(fp, m); + mac_ipq_label_destroy(fp); +#endif /* * Create header for new ip packet by * modifying header of first packet; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_var.h#3 (text+ko) ==== @@ -102,6 +102,9 @@ #endif u_int16_t ipq_div_cookie; /* ipfw divert cookie */ #endif +#ifdef MAC + struct label *ipq_label; /* MAC label */ +#endif }; /* ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#34 (text+ko) ==== @@ -52,38 +52,39 @@ #ifdef MAC +struct attrlist; struct auditinfo; -struct attrlist; struct bpf_d; struct componentname; struct devnode; struct fdescnode; struct fileglob; struct ifnet; +struct ifreq; struct inpcb; -struct ifreq; +struct ipq; struct lctx; +struct m_tag; struct mac; struct mac_module_data; +struct mbuf; struct mount; +struct pipe; +struct proc; struct pseminfo; struct pshminfo; -struct proc; struct semid_kernel; struct shmid_kernel; +struct sockaddr; +struct socket; +struct task; struct thread; struct timespec; struct ucred; struct uio; +struct vnode; struct vnode_attr; -struct vnode; -struct socket; -struct sockaddr; -struct mbuf; -struct m_tag; struct vop_setlabel_args; -struct pipe; -struct task; /*@ macros */ #define VNODE_LABEL_CREATE 1 @@ -167,6 +168,11 @@ int mac_inpcb_label_init(struct inpcb *inp, int flag); void mac_inpcb_label_recycle(struct inpcb *inp); void mac_inpcb_label_update(struct socket *so); +void mac_ipq_label_associate(struct mbuf *fragment, struct ipq *ipq); +int mac_ipq_label_compare(struct mbuf *fragment, struct ipq *ipq); +void mac_ipq_label_destroy(struct ipq *ipq); +int mac_ipq_label_init(struct ipq *ipq, int flag); +void mac_ipq_label_update(struct mbuf *fragment, struct ipq *ipq); struct label *mac_lctx_label_alloc(void); void mac_lctx_label_free(struct label *label); void mac_lctx_label_update(struct lctx *l, struct label *newlabel); @@ -176,6 +182,7 @@ void mac_mbuf_label_associate_bpfdesc(struct bpf_d *bpf_d, struct mbuf *m); void mac_mbuf_label_associate_ifnet(struct ifnet *ifp, struct mbuf *m); void mac_mbuf_label_associate_inpcb(struct inpcb *inp, struct mbuf *m); +void mac_mbuf_label_associate_ipq(struct ipq *ipq, struct mbuf *mbuf); void mac_mbuf_label_associate_linklayer(struct ifnet *ifp, struct mbuf *m); void mac_mbuf_label_associate_netlayer(struct mbuf *oldmbuf, struct mbuf *newmbuf); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_inet.c#3 (text+ko) ==== @@ -82,7 +82,6 @@ return (0); } -#ifdef notyet static struct label * mac_ipq_label_alloc(int flag) { @@ -111,7 +110,6 @@ return (ENOMEM); return (0); } -#endif static void mac_inpcb_label_free(struct label *label) @@ -136,7 +134,6 @@ MAC_PERFORM(inpcb_label_recycle, inp->inp_label); } -#ifdef notyet static void mac_ipq_label_free(struct label *label) { @@ -146,13 +143,12 @@ } void -mac_ipq_destroy(struct ipq *ipq) +mac_ipq_label_destroy(struct ipq *ipq) { mac_ipq_label_free(ipq->ipq_label); ipq->ipq_label = NULL; } -#endif void mac_inpcb_label_associate(struct socket *so, struct inpcb *inp) @@ -162,18 +158,15 @@ inp->inp_label); } -#ifdef notyet -/* XXXMAC - rename these */ void -mac_ipq_reassemble(struct ipq *ipq, struct mbuf *datagram) +mac_mbuf_label_associate_ipq(struct ipq *ipq, struct mbuf *m) { struct label *label; - label = mac_mbuf_to_label(datagram); + label = mac_mbuf_to_label(m); - MAC_PERFORM(ipq_reassemble, ipq, ipq->ipq_label, datagram, label); + MAC_PERFORM(mbuf_label_associate_ipq, ipq, ipq->ipq_label, m, label); } -#endif void mac_netinet_fragment(struct mbuf *datagram, struct mbuf *fragment) @@ -187,7 +180,6 @@ fragmentlabel); } -#ifdef notyet void mac_ipq_label_associate(struct mbuf *fragment, struct ipq *ipq) { @@ -197,7 +189,6 @@ MAC_PERFORM(ipq_label_associate, fragment, label, ipq, ipq->ipq_label); } -#endif void mac_mbuf_label_associate_inpcb(struct inpcb *inp, struct mbuf *m) @@ -210,9 +201,8 @@ MAC_PERFORM(mbuf_label_associate_inpcb, inp, inp->inp_label, m, mlabel); } -#ifdef notyet int -mac_ipq_match(struct mbuf *fragment, struct ipq *ipq) +mac_ipq_label_compare(struct mbuf *fragment, struct ipq *ipq) { struct label *label; int result; @@ -220,11 +210,10 @@ label = mac_mbuf_to_label(fragment); result = 1; - MAC_BOOLEAN(ipq_match, &&, fragment, label, ipq, ipq->ipq_label); + MAC_BOOLEAN(ipq_label_compare, &&, fragment, label, ipq, ipq->ipq_label); return (result); } -#endif void mac_netinet_icmp_reply(struct mbuf *m) @@ -246,17 +235,15 @@ MAC_PERFORM(netinet_tcp_reply, m, label); } -#ifdef notyet void -mac_ipq_update(struct mbuf *fragment, struct ipq *ipq) +mac_ipq_label_update(struct mbuf *fragment, struct ipq *ipq) { struct label *label; label = mac_mbuf_to_label(fragment); - MAC_PERFORM(ipq_update, fragment, label, ipq, ipq->ipq_label); + MAC_PERFORM(ipq_label_update, fragment, label, ipq, ipq->ipq_label); } -#endif int mac_inpcb_check_deliver(struct inpcb *inp, struct mbuf *m) ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#43 (text+ko) ==== @@ -62,6 +62,7 @@ struct fileglob; struct ifnet; struct inpcb; +struct ipq; struct label; struct lctx; struct mac_module_data; @@ -857,6 +858,10 @@ /** @brief Destroy file label @param label The label to be destroyed + + Destroy the label on a file descriptor. In this entry point, a + policy module should free any internal storage associated with + label so that it may be destroyed. */ typedef void mpo_file_label_destroy_t( struct label *label @@ -935,6 +940,10 @@ /** @brief Destroy ifnet label @param label The label to be destroyed + + Destroy the label on an ifnet label. In this entry point, a + policy module should free any internal storage associated with + label so that it may be destroyed. */ typedef void mpo_ifnet_label_destroy_t( struct label *label @@ -1059,6 +1068,10 @@ /** @brief Destroy inpcb label @param label The label to be destroyed + + Destroy the label on an inpcb label. In this entry point, a + policy module should free any internal storage associated with + label so that it may be destroyed. */ typedef void mpo_inpcb_label_destroy_t( struct label *label @@ -1125,6 +1138,91 @@ struct mac_module_data *mdata ); /** + @brief Create an IP reassembly queue label + @param fragment First received IP fragment + @param fragmentlabel Policy label for fragment + @param ipq IP reassembly queue to be labeled + @param ipqlabel Policy label to be filled in for ipq + + Set the label on a newly created IP reassembly queue from + the mbuf header of the first received fragment. +*/ +typedef void mpo_ipq_label_associate_t( + struct mbuf *fragment, + struct label *fragmentlabel, + struct ipq *ipq, + struct label *ipqlabel +); +/** + @brief Compare an mbuf header label to an ipq label + @param fragment IP datagram fragment + @param fragmentlabel Policy label for fragment + @param ipq IP fragment reassembly queue + @param ipqlabel Policy label for ipq + + Compare the label of the mbuf header containing an IP datagram + (fragment) fragment with the label of the passed IP fragment + reassembly queue (ipq). Return (1) for a successful match, or (0) + for no match. This call is made when the IP stack attempts to + find an existing fragment reassembly queue for a newly received + fragment; if this fails, a new fragment reassembly queue may be + instantiated for the fragment. Policies may use this entry point + to prevent the reassembly of otherwise matching IP fragments if + policy does not permit them to be reassembled based on the label + or other information. +*/ +typedef int mpo_ipq_label_compare_t( + struct mbuf *fragment, + struct label *fragmentlabel, + struct ipq *ipq, + struct label *ipqlabel +); +/** + @brief Destroy IP reassembly queue label + @param label The label to be destroyed + + Destroy the label on an IP fragment queue. In this entry point, a + policy module should free any internal storage associated with + label so that it may be destroyed. +*/ +typedef void mpo_ipq_label_destroy_t( + struct label *label +); +/** + @brief Initialize IP reassembly queue label + @param label New label to initialize + @param flag M_WAITOK or M_NOWAIT + + Initialize the label on a newly instantiated IP fragment reassembly + queue. The flag field may be one of M_WAITOK and M_NOWAIT, and + should be employed to avoid performing a sleeping malloc(9) during + this initialization call. IP fragment reassembly queue allocation + frequently occurs in performance sensitive environments, and the + implementation should be careful to avoid sleeping or long-lived + operations. This entry point is permitted to fail resulting in + the failure to allocate the IP fragment reassembly queue. +*/ +typedef int mpo_ipq_label_init_t( + struct label *label, + int flag +); +/** + @brief Update the label on an IP fragment reassembly queue + @param fragment IP fragment + @param fragmentlabel Policy label for fragment + @param ipq IP fragment reassembly queue + @param ipqlabel Policy label to be updated for ipq + + Update the label on an IP fragment reassembly queue (ipq) based + on the acceptance of the passed IP fragment mbuf header (fragment). +*/ +typedef void mpo_ipq_label_update_t( + struct mbuf *fragment, + struct label *fragmentlabel, + struct ipq *ipq, + struct label *ipqlabel +); +/** @brief Access control check for relabelling Login Context @param l Subject credential @param newlabel New label to apply to the Login Context @@ -1310,6 +1408,22 @@ struct label *m_label ); /** + @brief Set the label on a newly reassembled IP datagram + @param ipq IP fragment reassembly queue + @param ipqlabel Policy label for ipq + @param mbuf IP datagram to be labeled + @param mbuflabel Policy label to be filled in for mbuf + + Set the label on a newly reassembled IP datagram (mbuf) from the IP + fragment reassembly queue (ipq) from which it was generated. +*/ +typedef void mpo_mbuf_label_associate_ipq_t( + struct ipq *ipq, + struct label *ipqlabel, + struct mbuf *mbuf, + struct label *mbuflabel +); +/** @brief Assign a label to a new mbuf @param ifp Subject; network interface @param i_label Existing label of ifp @@ -5431,6 +5545,11 @@ mpo_inpcb_label_recycle_t *mpo_inpcb_label_recycle; mpo_inpcb_label_update_t *mpo_inpcb_label_update; mpo_iokit_check_device_t *mpo_iokit_check_device; + mpo_ipq_label_associate_t *mpo_ipq_label_associate; + mpo_ipq_label_compare_t *mpo_ipq_label_compare; + mpo_ipq_label_destroy_t *mpo_ipq_label_destroy; + mpo_ipq_label_init_t *mpo_ipq_label_init; + mpo_ipq_label_update_t *mpo_ipq_label_update; mpo_lctx_check_label_update_t *mpo_lctx_check_label_update; mpo_lctx_label_destroy_t *mpo_lctx_label_destroy; mpo_lctx_label_externalize_t *mpo_lctx_label_externalize; @@ -5443,6 +5562,7 @@ mpo_mbuf_label_associate_bpfdesc_t *mpo_mbuf_label_associate_bpfdesc; mpo_mbuf_label_associate_ifnet_t *mpo_mbuf_label_associate_ifnet; mpo_mbuf_label_associate_inpcb_t *mpo_mbuf_label_associate_inpcb; + mpo_mbuf_label_associate_ipq_t *mpo_mbuf_label_associate_ipq; mpo_mbuf_label_associate_linklayer_t *mpo_mbuf_label_associate_linklayer; mpo_mbuf_label_associate_netlayer_t *mpo_mbuf_label_associate_netlayer; mpo_mbuf_label_associate_socket_t *mpo_mbuf_label_associate_socket; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#67 (text+ko) ==== @@ -1,6 +1,6 @@ -/*- +/* * Copyright (c) 2002, 2003 Networks Associates Technology, Inc. - * Copyright (c) 2005-2006 SPARTA, Inc. + * Copyright (c) 2005-2007 SPARTA, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by NAI Labs, the @@ -950,6 +950,14 @@ } static void +sebsd_mbuf_label_associate_ipq(struct ipq *ipq, struct label *ipqlabel, + struct mbuf *mbuf, struct label *mbuflabel) +{ + + sebsd_label_copy(ipqlabel, mbuflabel); +} + +static void sebsd_posixsem_label_associate(struct ucred *cred, struct pseminfo *psem, struct label *psemlabel, const char *name) { @@ -3143,6 +3151,34 @@ } static void +sebsd_ipq_label_associate(struct mbuf *fragment, struct label *fragmentlabel, + struct ipq *ipq, struct label *ipqlabel) +{ + + sebsd_label_copy(fragmentlabel, ipqlabel); +} + +static int +sebsd_ipq_label_compare(struct mbuf *fragment, struct label *fragmentlabel, + struct ipq *ipq, struct label *ipqlabel) +{ + struct network_security_struct *fragsec, *ipqsec; + + fragsec = SLOT(fragmentlabel); + ipqsec = SLOT(ipqlabel); + + return (fragsec->sid == ipqsec->sid); +} + +static void +sebsd_ipq_label_update(struct mbuf *fragment, struct label *fragmentlabel, + struct ipq *ipq, struct label *ipqlabel) +{ + + sebsd_label_copy(fragmentlabel, ipqlabel); +} + +static void sebsd_netinet_fragment(struct mbuf *mbuf, struct label *mlabel, struct mbuf *frag, struct label *flabel) { @@ -3542,9 +3578,15 @@ .mpo_inpcb_label_init = sebsd_label_init2, .mpo_inpcb_label_recycle = sebsd_label_recycle, .mpo_inpcb_label_update = sebsd_inpcb_label_update, + .mpo_ipq_label_associate = sebsd_ipq_label_associate, + .mpo_ipq_label_compare = sebsd_ipq_label_compare, + .mpo_ipq_label_destroy = sebsd_label_destroy, + .mpo_ipq_label_init = sebsd_label_init2, + .mpo_ipq_label_update = sebsd_ipq_label_update, .mpo_mbuf_label_associate_bpfdesc = sebsd_mbuf_label_associate_bpfdesc, .mpo_mbuf_label_associate_ifnet = sebsd_mbuf_label_associate_ifnet, .mpo_mbuf_label_associate_inpcb = sebsd_mbuf_label_associate_inpcb, + .mpo_mbuf_label_associate_ipq = sebsd_mbuf_label_associate_ipq, .mpo_mbuf_label_associate_linklayer = sebsd_mbuf_label_associate_ifnet, .mpo_mbuf_label_associate_netlayer = sebsd_mbuf_label_associate_netlayer, .mpo_mbuf_label_associate_socket = sebsd_mbuf_label_associate_socket, From owner-p4-projects@FreeBSD.ORG Mon Jan 22 15:55:38 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F1DE16A5C2; Mon, 22 Jan 2007 15:55:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B147516A5A2 for ; Mon, 22 Jan 2007 15:55:36 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 03C2813C4BE for ; Mon, 22 Jan 2007 15:55:31 +0000 (UTC) (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 l0MFtUUU024316 for ; Mon, 22 Jan 2007 15:55:30 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFtUF7024313 for perforce@freebsd.org; Mon, 22 Jan 2007 15:55:30 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:55:30 GMT Message-Id: <200701221555.l0MFtUF7024313@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 113339 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 15:55:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=113339 Change 113339 by millert@millert_macbook on 2007/01/22 15:55:09 Add APSL modification notices. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/in_pcb.h#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_input.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/in_pcb.h#4 (text+ko) ==== @@ -62,6 +62,12 @@ * @(#)in_pcb.h 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/netinet/in_pcb.h,v 1.32.2.4 2001/08/13 16:26:17 ume Exp $ */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2007 to introduce + * 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. + */ #ifndef _NETINET_IN_PCB_H_ #define _NETINET_IN_PCB_H_ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_input.c#5 (text+ko) ==== @@ -62,6 +62,12 @@ * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 * $FreeBSD: src/sys/netinet/ip_input.c,v 1.130.2.25 2001/08/29 21:41:37 jesper Exp $ */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2007 to introduce + * 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. + */ #define _IP_VHL From owner-p4-projects@FreeBSD.ORG Mon Jan 22 15:56:33 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EB2C16A410; Mon, 22 Jan 2007 15:56:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F195916A40A for ; Mon, 22 Jan 2007 15:56:32 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E0A3B13C441 for ; Mon, 22 Jan 2007 15:56:32 +0000 (UTC) (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 l0MFuWaE024429 for ; Mon, 22 Jan 2007 15:56:32 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFuWtx024426 for perforce@freebsd.org; Mon, 22 Jan 2007 15:56:32 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:56:32 GMT Message-Id: <200701221556.l0MFuWtx024426@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 113340 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 15:56:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=113340 Change 113340 by millert@millert_macbook on 2007/01/22 15:55:36 Minor cleanup: Add SPAWAR contract number in comments Remove NULL mbuf label check that is no longer needed No need for error variable when using MAC_INTERNALIZE/MAC_EXTERNALIZE Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_net.c#11 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_net.c#11 (text+ko) ==== @@ -13,6 +13,9 @@ * 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: @@ -210,9 +213,6 @@ src_label = mac_mbuf_to_label(m_from); dest_label = mac_mbuf_to_label(m_to); - if (src_label == NULL || dest_label == NULL) - return; - MAC_PERFORM(mbuf_label_copy, src_label, dest_label); } @@ -227,21 +227,15 @@ mac_ifnet_label_externalize(struct label *label, char *elements, char *outbuf, size_t outbuflen) { - int error; - error = MAC_EXTERNALIZE(ifnet, label, elements, outbuf, outbuflen); - - return (error); + return (MAC_EXTERNALIZE(ifnet, label, elements, outbuf, outbuflen)); } static int mac_ifnet_label_internalize(struct label *label, char *string) { - int error; - error = MAC_INTERNALIZE(ifnet, label, string); - - return (error); + return (MAC_INTERNALIZE(ifnet, label, string)); } void From owner-p4-projects@FreeBSD.ORG Mon Jan 22 15:56:33 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6626416A51C; Mon, 22 Jan 2007 15:56:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3E04A16A494 for ; Mon, 22 Jan 2007 15:56:33 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2B8E413C45A for ; Mon, 22 Jan 2007 15:56:33 +0000 (UTC) (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 l0MFuXu8024436 for ; Mon, 22 Jan 2007 15:56:33 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MFuWUI024432 for perforce@freebsd.org; Mon, 22 Jan 2007 15:56:32 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 15:56:32 GMT Message-Id: <200701221556.l0MFuWUI024432@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 113341 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 15:56:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=113341 Change 113341 by millert@millert_macbook on 2007/01/22 15:56:11 Constify the name parameter of security_netif_sid() since ifnet_name() returns const char *. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/security.h#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/services.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/security.h#4 (text+ko) ==== @@ -74,7 +74,7 @@ int security_port_sid(u16 domain, u16 type, u8 protocol, u16 port, u32 *out_sid); -int security_netif_sid(char *name, u32 *if_sid, +int security_netif_sid(const char *name, u32 *if_sid, u32 *msg_sid); int security_node_sid(u16 domain, void *addr, u32 addrlen, ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/services.c#5 (text+ko) ==== @@ -1377,7 +1377,7 @@ * @if_sid: interface SID * @msg_sid: default SID for received packets */ -int security_netif_sid(char *name, +int security_netif_sid(const char *name, u32 *if_sid, u32 *msg_sid) { From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:01:40 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F4ED16A407; Mon, 22 Jan 2007 16:01:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4DC0616A404 for ; Mon, 22 Jan 2007 16:01:40 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3CBB213C465 for ; Mon, 22 Jan 2007 16:01:40 +0000 (UTC) (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 l0MG1em8025068 for ; Mon, 22 Jan 2007 16:01:40 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MG1eXG025053 for perforce@freebsd.org; Mon, 22 Jan 2007 16:01:40 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:01:40 GMT Message-Id: <200701221601.l0MG1eXG025053@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 113342 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:01:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=113342 Change 113342 by millert@millert_macbook on 2007/01/22 16:01:13 Use security_netif_sid() to get the sid for a network interface based on its name. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#68 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_labels.h#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#68 (text+ko) ==== @@ -72,6 +72,8 @@ #include #include +#include + #include #include #include @@ -933,6 +935,14 @@ } static void +sebsd_mbuf_label_associate_linklayer(struct ifnet *ifn, struct label *ilabel, + struct mbuf *m, struct label *mlabel) +{ + + sebsd_label_copy(ilabel, mlabel); +} + +static void sebsd_mbuf_label_associate_netlayer(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct mbuf *newmbuf, struct label *newmbuflabel) @@ -3061,14 +3071,13 @@ sebsd_ifnet_label_associate(struct ifnet *ifp, struct label *ifnetlabel) { struct network_security_struct *nsec; + u_int32_t msg_sid; - /* - * We just set the label to a default value and require that - * the system set a more specific value at ifconfig time. - */ nsec = SLOT(ifnetlabel); + /* XXX - should not need NULL check */ if (nsec != NULL) { - nsec->sid = SECINITSID_NETIF; + /* NOTE: msg_sid has been deprecated and is unused. */ + security_netif_sid(ifnet_name(ifp), &nsec->sid, &msg_sid); nsec->sclass = SECCLASS_NETIF; } } @@ -3587,7 +3596,7 @@ .mpo_mbuf_label_associate_ifnet = sebsd_mbuf_label_associate_ifnet, .mpo_mbuf_label_associate_inpcb = sebsd_mbuf_label_associate_inpcb, .mpo_mbuf_label_associate_ipq = sebsd_mbuf_label_associate_ipq, - .mpo_mbuf_label_associate_linklayer = sebsd_mbuf_label_associate_ifnet, + .mpo_mbuf_label_associate_linklayer = sebsd_mbuf_label_associate_linklayer, .mpo_mbuf_label_associate_netlayer = sebsd_mbuf_label_associate_netlayer, .mpo_mbuf_label_associate_socket = sebsd_mbuf_label_associate_socket, .mpo_mbuf_label_copy = sebsd_label_copy, ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_labels.h#7 (text+ko) ==== @@ -47,8 +47,9 @@ u_int16_t sclass; u_int16_t behavior; /* only used for mount */ }; -#define task_sid osid /* XXX - need to be separate if polymorphic */ +#define task_sid osid +/* Subsystem-specific label structs are used for improved readability */ #define task_security_struct sebsd_label #define file_security_struct sebsd_label #define vnode_security_struct sebsd_label From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:02:42 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BDF316A40A; Mon, 22 Jan 2007 16:02:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1AABF16A402 for ; Mon, 22 Jan 2007 16:02:42 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 09D9513C442 for ; Mon, 22 Jan 2007 16:02:42 +0000 (UTC) (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 l0MG2fYs025515 for ; Mon, 22 Jan 2007 16:02:41 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MG2fa8025509 for perforce@freebsd.org; Mon, 22 Jan 2007 16:02:41 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:02:41 GMT Message-Id: <200701221602.l0MG2fa8025509@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 113343 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:02:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=113343 Change 113343 by millert@millert_macbook on 2007/01/22 16:01:43 Ports returned by ipc_port_alloc_kernel() are not locked. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.c#10 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.c#10 (text+ko) ==== @@ -122,9 +122,6 @@ lh->lh_port = ipc_port_alloc_kernel(); lh->lh_type = LABELH_TYPE_KERN; lh->lh_references = 1; - ip_unlock(lh->lh_port); - - /* Must call ipc_kobject_set() with port unlocked. */ ipc_kobject_set(lh->lh_port, (ipc_kobject_t)lh, IKOT_LABELH); return (lh); From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:03:50 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2DB316A405; Mon, 22 Jan 2007 16:03:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 809E116A403 for ; Mon, 22 Jan 2007 16:03:50 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6EB1213C45E for ; Mon, 22 Jan 2007 16:03:50 +0000 (UTC) (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 l0MG3hF1027066 for ; Mon, 22 Jan 2007 16:03:43 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MG3hee027061 for perforce@freebsd.org; Mon, 22 Jan 2007 16:03:43 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:03:43 GMT Message-Id: <200701221603.l0MG3hee027061@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 113344 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:03:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=113344 Change 113344 by millert@millert_macbook on 2007/01/22 16:02:51 sebsd_label_destroy() may be passed a NULL pointer if one of the per-policy label init routines fails. In this case the framework has to clean up an allocations that did succeed but it is not smart enough to only clean up the ones up until the point of failure. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#69 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#69 (text+ko) ==== @@ -550,7 +550,8 @@ sebsd_label_destroy(struct label *label) { - mac_zfree(sebsd_label_zone, SLOT(label)); + if (SLOT(label) != NULL) + mac_zfree(sebsd_label_zone, SLOT(label)); SLOT(label) = NULL; } From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:04:56 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11F0316A403; Mon, 22 Jan 2007 16:04:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CA1B816A401 for ; Mon, 22 Jan 2007 16:04:55 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AD08313C4B7 for ; Mon, 22 Jan 2007 16:04:55 +0000 (UTC) (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 l0MG4jX1027304 for ; Mon, 22 Jan 2007 16:04:45 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MG4jrL027301 for perforce@freebsd.org; Mon, 22 Jan 2007 16:04:45 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:04:45 GMT Message-Id: <200701221604.l0MG4jrL027301@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 113345 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:04:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=113345 Change 113345 by millert@millert_macbook on 2007/01/22 16:03:51 No longer need MAC_SOCKET, use MAC instead. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/conf/MASTER#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sys_socket.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_socket.c#7 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_socket2.c#7 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_syscalls.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_usrreq.c#9 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/raw_ip.c#7 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/tcp_input.c#7 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/tcp_output.c#7 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/tcp_subr.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/conf/MASTER#3 (text+ko) ==== @@ -93,7 +93,6 @@ options HW_AST # Hardware ast support # options HW_FOOTPRINT # Cache footprint support # options MAC # Mandatory ACcess Control -options MAC_SOCKET # MAC socket labels options LCTX # Login Context options MACH # Standard Mach features # options MACH_ASSERT # Compile in assertions # ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sys_socket.c#6 (text+ko) ==== @@ -124,7 +124,7 @@ struct mbuf **controlp, int *flagsp); -#ifdef MAC_SOCKET +#ifdef MAC int error; #endif @@ -132,7 +132,7 @@ /* This is not a valid open file descriptor */ return(EBADF); } -#ifdef MAC_SOCKET +#ifdef MAC SOCK_LOCK(so); error = mac_socket_check_receive(cred, so); SOCK_UNLOCK(so); @@ -160,7 +160,7 @@ struct uio *uio2, struct mbuf *top, struct mbuf *control, int flags2); int stat; -#ifdef MAC_SOCKET +#ifdef MAC int error; #endif @@ -169,7 +169,7 @@ return (EBADF); } -#ifdef MAC_SOCKET +#ifdef MAC SOCK_LOCK(so); error = mac_socket_check_send(cred, so); SOCK_UNLOCK(so); @@ -367,7 +367,7 @@ return (0); socket_lock(so, 1); -#ifdef MAC_SOCKET +#ifdef MAC if (mac_socket_check_select(proc_ucred(p), so, which)) goto done; /* will unlock 'so' */ #endif @@ -417,7 +417,7 @@ { int stat; -#ifdef MAC_SOCKET +#ifdef MAC SOCK_LOCK(so); stat = mac_socket_check_stat(kauth_cred_get(), so); SOCK_UNLOCK(so); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_socket.c#7 (text+ko) ==== @@ -431,7 +431,7 @@ if (so) { so->so_gencnt = ++so_gencnt; so->so_zone = socket_zone; -#ifdef MAC_SOCKET +#ifdef MAC if (mac_socket_label_init(so, waitok) != 0) { sodealloc(so); return (NULL); @@ -497,7 +497,7 @@ so->so_rcv.sb_flags |= SB_RECV; /* XXX */ so->so_rcv.sb_so = so->so_snd.sb_so = so; #endif -#ifdef MAC_SOCKET +#ifdef MAC mac_socket_label_associate(kauth_cred_get(), so); #endif @@ -581,7 +581,7 @@ { so->so_gencnt = ++so_gencnt; -#ifdef MAC_SOCKET +#ifdef MAC mac_socket_label_destroy(so); #endif #ifndef __APPLE__ @@ -2155,7 +2155,7 @@ struct linger l; struct timeval tv; short val; -#ifdef MAC_SOCKET +#ifdef MAC struct mac extmac; #endif @@ -2349,7 +2349,7 @@ break; case SO_LABEL: -#ifdef MAC_SOCKET +#ifdef MAC error = sooptcopyin(sopt, &extmac, sizeof extmac, sizeof extmac); if (error) @@ -2415,7 +2415,7 @@ int error, optval; struct linger l; struct timeval tv; -#ifdef MAC_SOCKET +#ifdef MAC struct mac extmac; #endif @@ -2560,7 +2560,7 @@ goto integer; case SO_LABEL: -#ifdef MAC_SOCKET +#ifdef MAC error = sooptcopyin(sopt, &extmac, sizeof(extmac), sizeof(extmac)); if (error) @@ -2576,7 +2576,7 @@ break; case SO_PEERLABEL: -#ifdef MAC_SOCKET +#ifdef MAC error = sooptcopyin(sopt, &extmac, sizeof(extmac), sizeof(extmac)); if (error) @@ -2772,7 +2772,7 @@ struct sockbuf *sb; socket_lock(so, 1); -#ifdef MAC_SOCKET +#ifdef MAC if (mac_socket_check_kqfilter(proc_ucred(p), kn, so) != 0) { socket_unlock(so, 1); return (1); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_socket2.c#7 (text+ko) ==== @@ -305,7 +305,7 @@ so->so_pgid = head->so_pgid; so->so_uid = head->so_uid; so->so_usecount = 1; -#ifdef MAC_SOCKET +#ifdef MAC mac_socket_label_associate_accept(head, so); #endif ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_syscalls.c#4 (text+ko) ==== @@ -199,7 +199,7 @@ struct fileproc *fp; int fd, error; -#ifdef MAC_SOCKET +#ifdef MAC error = mac_socket_check_create(proc_ucred(p), uap->domain, uap->type, uap->protocol); if (error) @@ -249,7 +249,7 @@ goto out; AUDIT_ARG(sockaddr, p, sa); if (so != NULL) -#ifdef MAC_SOCKET +#ifdef MAC { SOCK_LOCK(so); error = mac_socket_check_bind(proc_ucred(p), so, sa); @@ -281,7 +281,7 @@ if (error) return (error); if (so != NULL) -#ifdef MAC_SOCKET +#ifdef MAC { SOCK_LOCK(so); error = mac_socket_check_listen(proc_ucred(p), so); @@ -353,7 +353,7 @@ error = EINVAL; goto out; } -#ifdef MAC_SOCKET +#ifdef MAC error = mac_socket_check_accept(proc_ucred(p), head); if (error != 0) { socket_unlock(head, 1); @@ -439,7 +439,7 @@ (void) soacceptlock(so, &sa, 0); socket_unlock(head, 1); #ifdef __darinw8_notyet -#ifdef MAC_SOCKET +#ifdef MAC error = mac_socket_check_accepted(proc_ucred(p), so, sa); if (error) { if (sa != 0) @@ -532,7 +532,7 @@ goto out; } AUDIT_ARG(sockaddr, p, sa); -#ifdef MAC_SOCKET +#ifdef MAC error = mac_socket_check_connect(proc_ucred(p), so, sa); if (error) goto bad; @@ -716,7 +716,7 @@ error = EBADF; goto bad; } -#ifdef MAC_SOCKET +#ifdef MAC SOCK_LOCK(so); error = mac_socket_check_send(proc_ucred(p), so); SOCK_UNLOCK(so); @@ -991,7 +991,7 @@ } proc_fdunlock(p); -#ifdef MAC_SOCKET +#ifdef MAC SOCK_LOCK(so); error = mac_socket_check_receive(proc_ucred(p), so); SOCK_UNLOCK(so); @@ -1897,7 +1897,7 @@ error = EINVAL; goto done3; } -#ifdef MAC_SOCKET +#ifdef MAC error = mac_socket_check_send(proc_ucred(p), so); if (error) goto done3; /* will unlock 'so' */ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_usrreq.c#9 (text+ko) ==== @@ -815,7 +815,7 @@ sizeof(unp->unp_peercred)); unp->unp_flags |= UNP_HAVEPC; -#ifdef MAC_SOCKET +#ifdef MAC /* XXXMAC: recursive lock: SOCK_LOCK(so); */ mac_socketpeer_label_associate_socket(so, so3); mac_socketpeer_label_associate_socket(so3, so); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/raw_ip.c#7 (text+ko) ==== @@ -375,7 +375,7 @@ inp->inp_route.ro_rt = (struct rtentry *)0; } -#ifdef MAC_SOCKET +#ifdef MAC mac_mbuf_label_associate_inpcb(inp, m); #endif ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/tcp_input.c#7 (text+ko) ==== @@ -910,7 +910,7 @@ else tiwin = th->th_win; -#ifdef MAC_SOCKET +#ifdef MAC if (mac_inpcb_check_deliver(inp, m)) goto drop; #endif @@ -1648,7 +1648,7 @@ if (thflags & TH_ACK) { tcpstat.tcps_connects++; soisconnected(so); -#ifdef MAC_SOCKET +#ifdef MAC /* XXXMAC: recursive lock: SOCK_LOCK(so); */ mac_socketpeer_label_associate_mbuf(m, so); /* XXXMAC: SOCK_UNLOCK(so); */ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/tcp_output.c#7 (text+ko) ==== @@ -1005,7 +1005,7 @@ m->m_len = hdrlen; } m->m_pkthdr.rcvif = 0; -#ifdef MAC_SOCKET +#ifdef MAC mac_mbuf_label_associate_inpcb(tp->t_inpcb, m); #endif #if INET6 ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/tcp_subr.c#8 (text+ko) ==== @@ -575,7 +575,7 @@ m->m_len = tlen; m->m_pkthdr.len = tlen; m->m_pkthdr.rcvif = 0; -#ifdef MAC_SOCKET +#ifdef MAC if (tp != NULL && tp->t_inpcb != NULL) { /* * Packet is associated with a socket, so allow the From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:05:50 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A6D0916A563; Mon, 22 Jan 2007 16:05:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7FFFD16A46D for ; Mon, 22 Jan 2007 16:05:50 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6F5B913C4A5 for ; Mon, 22 Jan 2007 16:05:50 +0000 (UTC) (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 l0MG5luO027467 for ; Mon, 22 Jan 2007 16:05:47 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MG5lMK027464 for perforce@freebsd.org; Mon, 22 Jan 2007 16:05:47 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:05:47 GMT Message-Id: <200701221605.l0MG5lMK027464@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 113346 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:05:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=113346 Change 113346 by millert@millert_macbook on 2007/01/22 16:05:42 Back out some changes to the vendor code that made soalloc() take M_WAIT or M_WAITOK instead of a boolean. There's no good reason to deviate like this and the conversion has been a source of several bugs. This does mean we need to be careful and convert waitok to M_WAITOK/M_NOWAIT when we call in to the framework but this is as simple as passing in !waitok instead. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_socket.c#8 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_socket2.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_socket.c#8 (text+ko) ==== @@ -282,7 +282,7 @@ lck_mtx_unlock(so_cache_mtx); - if (waitok == M_WAITOK) + if (waitok) *so = (struct socket *) zalloc(so_cache_zone); else *so = (struct socket *) zalloc_noblock(so_cache_zone); @@ -432,7 +432,8 @@ so->so_gencnt = ++so_gencnt; so->so_zone = socket_zone; #ifdef MAC - if (mac_socket_label_init(so, waitok) != 0) { + /* Convert waitok to M_WAITOK/M_NOWAIT for MAC Framework. */ + if (mac_socket_label_init(so, !waitok) != 0) { sodealloc(so); return (NULL); } @@ -475,7 +476,7 @@ #endif if (prp->pr_type != type) return (EPROTOTYPE); - so = soalloc(M_WAITOK, dom, type); + so = soalloc(p != 0, dom, type); if (so == 0) return (ENOBUFS); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/uipc_socket2.c#8 (text+ko) ==== @@ -286,7 +286,7 @@ if (head->so_qlen > 3 * head->so_qlimit / 2) return ((struct socket *)0); - so = soalloc(M_NOWAIT, head->so_proto->pr_domain->dom_family, head->so_type); + so = soalloc(1, head->so_proto->pr_domain->dom_family, head->so_type); if (so == NULL) return ((struct socket *)0); /* check if head was closed during the soalloc */ From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:06:49 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B318D16A403; Mon, 22 Jan 2007 16:06:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6FF7F16A401 for ; Mon, 22 Jan 2007 16:06:49 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5F3C713C442 for ; Mon, 22 Jan 2007 16:06:49 +0000 (UTC) (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 l0MG6nDp027523 for ; Mon, 22 Jan 2007 16:06:49 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MG6nC1027520 for perforce@freebsd.org; Mon, 22 Jan 2007 16:06:49 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:06:49 GMT Message-Id: <200701221606.l0MG6nC1027520@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 113347 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:06:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=113347 Change 113347 by millert@millert_macbook on 2007/01/22 16:06:13 Add missing mac_framework include. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_input.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/task.c#9 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_input.c#6 (text+ko) ==== @@ -111,6 +111,10 @@ #include #include +#ifdef MAC +#include +#endif + #include #define DBG_LAYER_BEG NETDBG_CODE(DBG_NETIP, 0) ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/task.c#9 (text+ko) ==== @@ -1711,7 +1711,7 @@ if (thread->label == oldlabel) lh_release(oldlabel); } - task->label = labelh_modify(task->label, 0); + task->label = labelh_modify(task->label, 1); mac_task_label_update(pl, &task->maclabel); /* * Replace the old label in the task's threads with the new one. @@ -1752,7 +1752,7 @@ if (thread->label == oldlabel) lh_release(oldlabel); } - task->label = labelh_modify(task->label, 0); + task->label = labelh_modify(task->label, 1); (*f)(&task->maclabel, arg); /* * Replace the old label in the task's threads with the new one. From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:06:51 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 025F316A51A; Mon, 22 Jan 2007 16:06:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D44B616A4F2 for ; Mon, 22 Jan 2007 16:06:49 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B32F713C468 for ; Mon, 22 Jan 2007 16:06:49 +0000 (UTC) (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 l0MG6nSI027530 for ; Mon, 22 Jan 2007 16:06:49 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MG6nMq027526 for perforce@freebsd.org; Mon, 22 Jan 2007 16:06:49 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:06:49 GMT Message-Id: <200701221606.l0MG6nMq027526@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 113348 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:06:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=113348 Change 113348 by millert@millert_macbook on 2007/01/22 16:06:42 Use vfs_context_ucred() instead of pulling the ucred out of the proc structure. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_exec.c#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_exec.c#6 (text+ko) ==== @@ -1410,7 +1410,8 @@ } #ifdef MAC - error = mac_vnode_check_exec(p->p_ucred, vp, imgp->ip_execlabelp); + error = mac_vnode_check_exec(vfs_context_ucred(imgp->ip_vfs_context), + vp, imgp); if (error) return (error); #endif From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:07:52 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D06BF16A405; Mon, 22 Jan 2007 16:07:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AE92016A401 for ; Mon, 22 Jan 2007 16:07:51 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9D21F13C44C for ; Mon, 22 Jan 2007 16:07:51 +0000 (UTC) (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 l0MG7pZw027698 for ; Mon, 22 Jan 2007 16:07:51 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MG7phj027695 for perforce@freebsd.org; Mon, 22 Jan 2007 16:07:51 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:07:51 GMT Message-Id: <200701221607.l0MG7phj027695@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 113349 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:07:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=113349 Change 113349 by millert@millert_macbook on 2007/01/22 16:07:40 Use a single read/write lock for the avc cache instead of multiple spinlocks, based on the locking we used in sedarwin78. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#18 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#18 (text+ko) ==== @@ -109,8 +109,7 @@ struct avc_cache { LIST_HEAD(, avc_node) slots[AVC_CACHE_SLOTS]; - lck_spin_t *slots_lock[AVC_CACHE_SLOTS]; - atomic_t lru_hint; /* LRU hint for reclaim scan */ + u32 lru_hint; /* LRU hint for reclaim scan */ atomic_t active_nodes; u32 latest_notif; /* latest revocation notification */ }; @@ -139,8 +138,11 @@ static lck_grp_t *avc_lck_grp; -#define AVC_LOCK(n) lck_spin_lock(avc_cache.slots_lock[n]) -#define AVC_UNLOCK(n) lck_spin_unlock(avc_cache.slots_lock[n]) +static lck_rw_t *avc_lock; +#define AVC_RDLOCK lck_rw_lock_shared(avc_lock) +#define AVC_WRLOCK lck_rw_lock_exclusive(avc_lock) +#define AVC_RDUNLOCK lck_rw_unlock_shared(avc_lock) +#define AVC_WRUNLOCK lck_rw_unlock_exclusive(avc_lock) static lck_spin_t *notif_lock; #define NOTIF_LOCK lck_spin_lock(notif_lock) @@ -269,12 +271,11 @@ /* allocate avc locks */ avc_log_lock = lck_spin_alloc_init(avc_lck_grp, avc_lck_attr); + avc_lock = lck_rw_alloc_init(avc_lck_grp, avc_lck_attr); notif_lock = lck_spin_alloc_init(avc_lck_grp, avc_lck_attr); for (i = 0; i < AVC_CACHE_SLOTS; i++) { LIST_INIT(&avc_cache.slots[i]); - avc_cache.slots_lock[i] = - lck_spin_alloc_init(avc_lck_grp, avc_lck_attr); } avc_cache.active_nodes = 0; avc_cache.lru_hint = 0; @@ -301,10 +302,11 @@ int i, chain_len, max_chain_len, slots_used; struct avc_node *node; + AVC_RDLOCK; + slots_used = 0; max_chain_len = 0; for (i = 0; i < AVC_CACHE_SLOTS; i++) { - AVC_LOCK(i); if (!LIST_EMPTY(&avc_cache.slots[i])) { slots_used++; chain_len = 0; @@ -313,9 +315,10 @@ if (chain_len > max_chain_len) max_chain_len = chain_len; } - AVC_UNLOCK(i); } + AVC_RDUNLOCK; + return scnprintf(page, PAGE_SIZE, "entries: %d\nbuckets used: %d/%d\n" "longest chain: %d\n", atomic_read(&avc_cache.active_nodes), @@ -360,10 +363,12 @@ struct avc_node *node, *next; int hvalue, try, ecx; + AVC_WRLOCK; + + hvalue = avc_cache.lru_hint; for (try = 0, ecx = 0; try < AVC_CACHE_SLOTS; try++ ) { - hvalue = atomic_inc_return(&avc_cache.lru_hint) & (AVC_CACHE_SLOTS - 1); + hvalue = (hvalue + 1) & (AVC_CACHE_SLOTS - 1); - AVC_LOCK(hvalue); for (node = LIST_FIRST(&avc_cache.slots[hvalue]); node != NULL; node = next) { next = LIST_NEXT(node, list); @@ -372,15 +377,14 @@ avc_node_delete(node); avc_cache_stats_incr(reclaims); ecx++; - if (ecx >= AVC_CACHE_RECLAIM) { - AVC_UNLOCK(hvalue); + if (ecx >= AVC_CACHE_RECLAIM) goto out; - } } } - AVC_UNLOCK(hvalue); } out: + avc_cache.lru_hint = hvalue; + AVC_WRUNLOCK; return ecx; } @@ -411,17 +415,13 @@ memcpy(&node->ae.avd, &ae->avd, sizeof(node->ae.avd)); } -/* - * Note: returns with read lock held for hvalue. - */ -static inline struct avc_node *avc_search_node(u32 ssid, u32 tsid, u16 tclass, - int *hvaluep) +static inline struct avc_node *avc_search_node(u32 ssid, u32 tsid, u16 tclass) { struct avc_node *node, *ret = NULL; + int hvalue; - *hvaluep = avc_hash(ssid, tsid, tclass); - AVC_LOCK(*hvaluep); - LIST_FOREACH(node, &avc_cache.slots[*hvaluep], list) { + hvalue = avc_hash(ssid, tsid, tclass); + LIST_FOREACH(node, &avc_cache.slots[hvalue], list) { if (ssid == node->ae.ssid && tclass == node->ae.tclass && tsid == node->ae.tsid) { @@ -448,28 +448,26 @@ * @tsid: target security identifier * @tclass: target security class * @requested: requested permissions, interpreted based on @tclass - * @hvaluep: cache slot of the node on success * * Look up an AVC entry that is valid for the * @requested permissions between the SID pair * (@ssid, @tsid), interpreting the permissions * based on @tclass. If a valid AVC entry exists, - * then this function return the avc_node and read locks its slot. + * then this function return the avc_node. * Otherwise, this function returns NULL. */ -static struct avc_node *avc_lookup(u32 ssid, u32 tsid, u16 tclass, u32 requested, int *hvaluep) +static struct avc_node *avc_lookup(u32 ssid, u32 tsid, u16 tclass, u32 requested) { struct avc_node *node; avc_cache_stats_incr(lookups); - node = avc_search_node(ssid, tsid, tclass, hvaluep); + node = avc_search_node(ssid, tsid, tclass); if (node && ((node->ae.avd.decided & requested) == requested)) { avc_cache_stats_incr(hits); goto out; } - AVC_UNLOCK(*hvaluep); node = NULL; avc_cache_stats_incr(misses); out: @@ -502,7 +500,6 @@ * @tsid: target security identifier * @tclass: target security class * @ae: AVC entry - * @hvaluep: cache slot of the node on success * * Insert an AVC entry for the SID pair * (@ssid, @tsid) and class @tclass. @@ -511,32 +508,35 @@ * response to a security_compute_av() call. If the * sequence number @ae->avd.seqno is not less than the latest * revocation notification, then the function copies - * the access vectors into a cache entry, returns (WRITE-locked) + * the access vectors into a cache entry, returns * avc_node inserted. Otherwise, this function returns NULL. */ -static struct avc_node *avc_insert(u32 ssid, u32 tsid, u16 tclass, struct avc_entry *ae, int *hvaluep) +static struct avc_node *avc_insert(u32 ssid, u32 tsid, u16 tclass, struct avc_entry *ae) { struct avc_node *pos, *node; + int hvalue; if (avc_latest_notif_update(ae->avd.seqno, 1)) return NULL; node = avc_alloc_node(); if (node) { - *hvaluep = avc_hash(ssid, tsid, tclass); + hvalue = avc_hash(ssid, tsid, tclass); avc_node_populate(node, ssid, tsid, tclass, ae); - AVC_LOCK(*hvaluep); + AVC_WRLOCK; - LIST_FOREACH(pos, &avc_cache.slots[*hvaluep], list) { + LIST_FOREACH(pos, &avc_cache.slots[hvalue], list) { if (pos->ae.ssid == ssid && pos->ae.tsid == tsid && pos->ae.tclass == tclass) { avc_node_replace(node, pos); + AVC_WRUNLOCK; goto found; } } - LIST_INSERT_HEAD(&avc_cache.slots[*hvaluep], node, list); + LIST_INSERT_HEAD(&avc_cache.slots[hvalue], node, list); + AVC_WRUNLOCK; } found: return node; @@ -834,9 +834,9 @@ goto out; } - /* Lock the target slot */ hvalue = avc_hash(ssid, tsid, tclass); - AVC_LOCK(hvalue); + + AVC_WRLOCK; LIST_FOREACH(pos, &avc_cache.slots[hvalue], list){ if ( ssid==pos->ae.ssid && @@ -882,7 +882,7 @@ } avc_node_replace(node, orig); out_unlock: - AVC_UNLOCK(hvalue); + AVC_WRUNLOCK; out: return rc; } @@ -897,14 +897,15 @@ int i, rc = 0, tmprc; struct avc_node *node; + AVC_WRLOCK; for (i = 0; i < AVC_CACHE_SLOTS; i++) { - AVC_LOCK(i); while ((node = LIST_FIRST(&avc_cache.slots[i])) != NULL) avc_node_delete(node); - AVC_UNLOCK(i); } + AVC_WRUNLOCK; + for (c = avc_callbacks; c; c = c->next) { if (c->events & AVC_CALLBACK_RESET) { tmprc = c->callback(AVC_CALLBACK_RESET, @@ -945,29 +946,28 @@ { struct avc_node *node; struct avc_entry entry, *p_ae; - int hvalue, found, rc = 0; + int rc = 0; u32 denied; - node = avc_lookup(ssid, tsid, tclass, requested, &hvalue); - found = node != NULL; + AVC_RDLOCK; + node = avc_lookup(ssid, tsid, tclass, requested); + AVC_RDUNLOCK; - if (!found) { + if (!node) { rc = security_compute_av(ssid,tsid,tclass,requested,&entry.avd); if (rc) goto out; - node = avc_insert(ssid,tsid,tclass,&entry,&hvalue); + node = avc_insert(ssid,tsid,tclass,&entry); } + AVC_RDLOCK; p_ae = node ? &node->ae : &entry; if (avd) memcpy(avd, &p_ae->avd, sizeof(*avd)); denied = requested & ~(p_ae->avd.allowed); - if (found) - AVC_UNLOCK(hvalue); /* locked by avc_lookup() */ - else if (node) - AVC_UNLOCK(hvalue); /* locked by avc_insert() */ + AVC_RDUNLOCK; if (!requested || denied) { if (selinux_enforcing) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:08:53 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC55416A479; Mon, 22 Jan 2007 16:08:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9629316A400 for ; Mon, 22 Jan 2007 16:08:53 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 84CBA13C45E for ; Mon, 22 Jan 2007 16:08:53 +0000 (UTC) (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 l0MG8rPK027765 for ; Mon, 22 Jan 2007 16:08:53 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MG8r2r027762 for perforce@freebsd.org; Mon, 22 Jan 2007 16:08:53 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:08:53 GMT Message-Id: <200701221608.l0MG8r2r027762@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 113350 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:08:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=113350 Change 113350 by millert@millert_macbook on 2007/01/22 16:08:06 No longer delay avc logging via printf() until the thread exits. It no longer seems to be required. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc_audit.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/linux-compat.h#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#70 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc_audit.c#5 (text+ko) ==== @@ -43,76 +43,34 @@ /* * Emulate Linux audit API. - * In the future we may wish to use the BSM audit support instead. + * In the future we may wish to use the BSD audit support instead. */ +lck_spin_t *avc_log_lock; + struct audit_buffer { struct sbuf sbuf; char buf[1024]; }; - -#define AUDIT_SLOT_MAX 256 -static SInt32 nslots; -struct audit_buffer *audit_slots[AUDIT_SLOT_MAX]; - -lck_spin_t *avc_log_lock; +static struct audit_buffer audit_buf; struct audit_buffer * audit_log_start(void) { - struct audit_buffer *ab; - ab = sebsd_malloc(sizeof(*ab), M_SEBSD, M_NOWAIT); - if (ab != NULL) - sbuf_new(&ab->sbuf, ab->buf, sizeof(ab->buf), SBUF_FIXEDLEN); - - return (ab); + lck_spin_lock(avc_log_lock); + sbuf_new(&audit_buf.sbuf, audit_buf.buf, sizeof(audit_buf.buf), + SBUF_FIXEDLEN); + return (&audit_buf); } void audit_log_end(struct audit_buffer *ab) { - int i; - UInt32 oldval; sbuf_finish(&ab->sbuf); - - /* - * Find and claim an audit slot (assumes 32bit pointers). - */ - for (i = 0; i < AUDIT_SLOT_MAX; i++) { - oldval = (UInt32)audit_slots[i]; - if (oldval == 0 && OSCompareAndSwap(oldval, (UInt32)ab, - (UInt32 *)&audit_slots[i])) { - OSIncrementAtomic(&nslots); - return; - } - } - /* No free slots, drop record. */ - sebsd_free(ab, M_SEBSD); -} - -void -audit_log_process(void) -{ - struct audit_buffer *ab; - int i; - - /* - * Print and free all existing (finished) audit records. - */ - lck_spin_lock(avc_log_lock); - for (i = 0; nslots != 0 && i < AUDIT_SLOT_MAX; i++) { - ab = audit_slots[i]; - if (ab != NULL) { - if (OSCompareAndSwap((UInt32)ab, 0, - (UInt32 *)&audit_slots[i])) { - OSDecrementAtomic(&nslots); - printf("\n%s\n", sbuf_data(&ab->sbuf)); - sebsd_free(ab, M_SEBSD); - } - } - } + printf("\n%s\n", sbuf_data(&ab->sbuf)); + sbuf_delete(&ab->sbuf); /* XXX - not really needed */ lck_spin_unlock(avc_log_lock); } ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/linux-compat.h#6 (text+ko) ==== @@ -142,7 +142,6 @@ void audit_log_end(struct audit_buffer *); void audit_log_format(struct audit_buffer *, const char *, ...); void audit_log_untrustedstring(struct audit_buffer *, const char *); -void audit_log_process(void); #define audit_log(ac, mf, af, ...) sebsd_log(__VA_ARGS__) /* we don't enable the selinux netlbl support */ ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#70 (text+ko) ==== @@ -3530,14 +3530,6 @@ return (ipc_has_perm(cred, pshmlabel, SHM__DESTROY)); } -static void -sebsd_thread_userret(int code, int error, struct thread *thread) -{ - - /* Process any pending audit log records at syscall exit. */ - audit_log_process(); -} - static struct mac_policy_ops sebsd_ops = { .mpo_bpfdesc_label_associate = sebsd_bpfdesc_label_associate, .mpo_bpfdesc_label_destroy = sebsd_label_destroy, @@ -3749,7 +3741,6 @@ .mpo_task_label_init = sebsd_label_init, .mpo_task_label_internalize = sebsd_label_internalize, .mpo_task_label_update = sebsd_task_label_update, - .mpo_thread_userret = sebsd_thread_userret, .mpo_vnode_check_access = sebsd_vnode_check_access, .mpo_vnode_check_chdir = sebsd_vnode_check_chdir, .mpo_vnode_check_chroot = sebsd_vnode_check_chroot, From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:09:55 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0AC916A404; Mon, 22 Jan 2007 16:09:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7CFEA16A402 for ; Mon, 22 Jan 2007 16:09:55 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6BE1E13C4A6 for ; Mon, 22 Jan 2007 16:09:55 +0000 (UTC) (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 l0MG9tx1028003 for ; Mon, 22 Jan 2007 16:09:55 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MG9t7N028000 for perforce@freebsd.org; Mon, 22 Jan 2007 16:09:55 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:09:55 GMT Message-Id: <200701221609.l0MG9t7N028000@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 113351 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:09:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=113351 Change 113351 by millert@millert_macbook on 2007/01/22 16:08:54 Modify the mac_vnode_check_exec() API to take struct image_params instead of the label. The Framework should pull the label out of the object itself. Also add a struct componentname pointer to mpo_vnode_check_exec to avoid a call to vn_getpath(). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_exec.c#7 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#35 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#44 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#25 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#71 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_exec.c#7 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/sys/Makefile#2 (text+ko) ==== @@ -56,7 +56,7 @@ errno.h ev.h event.h fcntl.h file.h filedesc.h filio.h \ ioccom.h ioctl.h ipc.h \ ioctl_compat.h kernel.h kernel_types.h kern_event.h lctx.h lock.h lockf.h \ - kauth.h kdebug.h md5.h kern_control.h malloc.h namei.h \ + kauth.h kdebug.h md5.h kern_control.h imgact.h malloc.h namei.h \ mman.h mbuf.h mount.h mtio.h netport.h param.h paths.h \ proc.h queue.h quota.h random.h resource.h resourcevar.h \ sbuf.h posix_sem.h posix_shm.h sem.h shm.h \ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#35 (text+ko) ==== @@ -61,6 +61,7 @@ struct fileglob; struct ifnet; struct ifreq; +struct image_params; struct inpcb; struct ipq; struct lctx; @@ -373,7 +374,7 @@ int mac_vnode_check_exchangedata(struct ucred *cred, struct vnode *v1, struct vnode *v2); int mac_vnode_check_exec(struct ucred *cred, struct vnode *vp, - struct label *execlabel); + struct image_params *imgp); int mac_vnode_check_getattrlist(struct ucred *cred, struct vnode *vp, struct attrlist *alist); int mac_vnode_check_getextattr(struct ucred *cred, struct vnode *vp, ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#44 (text+ko) ==== @@ -4487,6 +4487,7 @@ @param vp Object vnode to execute @param label Policy label for vp @param execlabel Userspace provided execution label + @param cnp Component name for file being executed Determine whether the subject identified by the credential can execute the passed vnode. Determination of execute privilege is made separately @@ -4505,7 +4506,8 @@ struct ucred *cred, struct vnode *vp, struct label *label, - struct label *execlabel /* NULLOK */ + struct label *execlabel, /* NULLOK */ + struct componentname *cnp ); /** @brief Access control check for retrieving file attributes ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#25 (text+ko) ==== @@ -42,6 +42,7 @@ #include #include +#include #include #include #include @@ -462,11 +463,13 @@ } int -mac_vnode_check_exec(struct ucred *cred, struct vnode *vp, struct label *execl) +mac_vnode_check_exec(struct ucred *cred, struct vnode *vp, + struct image_params *imgp) { int error; - MAC_CHECK(vnode_check_exec, cred, vp, vp->v_label, execl); + MAC_CHECK(vnode_check_exec, cred, vp, vp->v_label, + imgp->ip_execlabelp, &imgp->ip_ndp->ni_cnd); return (error); } ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#71 (text+ko) ==== @@ -2046,7 +2046,7 @@ static int sebsd_vnode_check_exec(struct ucred *cred, struct vnode *vp, - struct label *label, struct label *execlabel) + struct label *label, struct label *execlabel, struct componentname *cnp) { struct task_security_struct *task; struct vnode_security_struct *file; @@ -2067,6 +2067,8 @@ AVC_AUDIT_DATA_INIT(&ad, FS); ad.u.fs.vp = vp; + ad.u.fs.path = cnp->cn_pnbuf; + ad.u.fs.pathlen = cnp->cn_nameptr - cnp->cn_pnbuf + cnp->cn_namelen; if (newsid == task->sid) { rc = avc_has_perm(task->sid, file->sid, SECCLASS_FILE, From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:09:56 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03DC816A50F; Mon, 22 Jan 2007 16:09:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D2BDB16A4D7 for ; Mon, 22 Jan 2007 16:09:55 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BFB6013C4A7 for ; Mon, 22 Jan 2007 16:09:55 +0000 (UTC) (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 l0MG9tfT028010 for ; Mon, 22 Jan 2007 16:09:55 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MG9tJE028006 for perforce@freebsd.org; Mon, 22 Jan 2007 16:09:55 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:09:55 GMT Message-Id: <200701221609.l0MG9tJE028006@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 113352 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:09:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=113352 Change 113352 by millert@millert_macbook on 2007/01/22 16:09:15 We have mac_netinet_fragment() now so use it. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet6/ip6_output.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet6/ip6_output.c#5 (text+ko) ==== @@ -1108,11 +1108,9 @@ m->m_pkthdr.len = len + hlen + sizeof(*ip6f); m->m_pkthdr.rcvif = 0; m->m_pkthdr.socket_id = m0->m_pkthdr.socket_id; -#ifdef __darwin8_notyet #ifdef MAC mac_netinet_fragment(m0, m); #endif -#endif ip6f->ip6f_reserved = 0; ip6f->ip6f_ident = id; ip6f->ip6f_nxt = nextproto; From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:11:59 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3130016A40E; Mon, 22 Jan 2007 16:11:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0990216A404 for ; Mon, 22 Jan 2007 16:11:59 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EC85713C45A for ; Mon, 22 Jan 2007 16:11:58 +0000 (UTC) (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 l0MGBwHb028798 for ; Mon, 22 Jan 2007 16:11:58 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGBwKc028794 for perforce@freebsd.org; Mon, 22 Jan 2007 16:11:58 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:11:58 GMT Message-Id: <200701221611.l0MGBwKc028794@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 113353 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:11:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=113353 Change 113353 by millert@millert_macbook on 2007/01/22 16:11:12 Change 2nd param to mac_execve_enter() from a label pointer to an imgp. This means mac_execve_enter() must allocate ip_execlabelp itself, moving some MAC-specific code into mac_process.c where it belongs. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_exec.c#8 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#36 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_process.c#14 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_exec.c#8 (text+ko) ==== @@ -894,12 +894,9 @@ #ifdef MAC if (uap->mac_p != USER_ADDR_NULL) { - imgp->ip_execlabelp = mac_cred_label_alloc(); - error = mac_execve_enter(uap->mac_p, imgp->ip_execlabelp); - if (error) { - mac_cred_label_free(imgp->ip_execlabelp); + error = mac_execve_enter(uap->mac_p, imgp); + if (error) return (error); - } } #endif ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#36 (text+ko) ==== @@ -130,7 +130,7 @@ void mac_devfs_label_init(struct devnode *de); void mac_devfs_label_update(struct mount *mp, struct devnode *de, struct vnode *vp); -int mac_execve_enter(user_addr_t mac_p, struct label *execlabel); +int mac_execve_enter(user_addr_t mac_p, struct image_params *imgp); int mac_file_check_change_offset(struct ucred *cred, struct fileglob *fg); int mac_file_check_create(struct ucred *cred); int mac_file_check_dup(struct ucred *cred, struct fileglob *fg, int newfd); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_process.c#14 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include #include +#include #include @@ -186,9 +187,10 @@ } int -mac_execve_enter(user_addr_t mac_p, struct label *execlabelstorage) +mac_execve_enter(user_addr_t mac_p, struct image_params *imgp) { struct mac mac; + struct label *execlabel; char *buffer; int error; size_t ulen; @@ -204,15 +206,20 @@ if (error) return (error); + execlabel = mac_cred_label_alloc(); MALLOC(buffer, char *, mac.m_buflen, M_MACTEMP, M_WAITOK); error = copyinstr(CAST_USER_ADDR_T(mac.m_string), buffer, mac.m_buflen, &ulen); + if (error) + goto out; + AUDIT_ARG(mac_string, buffer); + + error = mac_cred_label_internalize(execlabel, buffer); +out: if (error) { - FREE(buffer, M_MACTEMP); - return (error); + mac_cred_label_free(execlabel); + execlabel = NULL; } - AUDIT_ARG(mac_string, buffer); - - error = mac_cred_label_internalize(execlabelstorage, buffer); + imgp->ip_execlabelp = execlabel; FREE(buffer, M_MACTEMP); return (error); } From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:12:00 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95F7116A4F8; Mon, 22 Jan 2007 16:12:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 73FA116A401 for ; Mon, 22 Jan 2007 16:11:59 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4AFB113C45B for ; Mon, 22 Jan 2007 16:11:59 +0000 (UTC) (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 l0MGBxlx028807 for ; Mon, 22 Jan 2007 16:11:59 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGBwun028801 for perforce@freebsd.org; Mon, 22 Jan 2007 16:11:58 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:11:58 GMT Message-Id: <200701221611.l0MGBwun028801@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 113354 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:12:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=113354 Change 113354 by millert@millert_macbook on 2007/01/22 16:11:40 Move ipq_label to be before the IPDIVERT elements since IPDIVERT is not always defined which had the effect of writing the label pointer over the IPDIVERT elements in mac_inet.c. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_var.h#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_var.h#4 (text+ko) ==== @@ -61,6 +61,12 @@ * * @(#)ip_var.h 8.2 (Berkeley) 1/9/95 */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2007 to introduce + * 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. + */ #ifndef _NETINET_IP_VAR_H_ #define _NETINET_IP_VAR_H_ @@ -94,6 +100,9 @@ u_long ipq_nfrags; TAILQ_ENTRY(ipq) ipq_list; u_long reserved[1]; /* for future use */ +#ifdef MAC + struct label *ipq_label; /* MAC label */ +#endif #if IPDIVERT #ifdef IPDIVERT_44 u_int32_t ipq_div_info; /* ipfw divert port & flags */ @@ -102,9 +111,6 @@ #endif u_int16_t ipq_div_cookie; /* ipfw divert cookie */ #endif -#ifdef MAC - struct label *ipq_label; /* MAC label */ -#endif }; /* From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:13:01 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C573416A408; Mon, 22 Jan 2007 16:13:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8B2FA16A401 for ; Mon, 22 Jan 2007 16:13:01 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6DEB113C44B for ; Mon, 22 Jan 2007 16:13:01 +0000 (UTC) (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 l0MGD1ut029121 for ; Mon, 22 Jan 2007 16:13:01 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGD1Ue029118 for perforce@freebsd.org; Mon, 22 Jan 2007 16:13:01 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:13:01 GMT Message-Id: <200701221613.l0MGD1Ue029118@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 113355 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:13:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=113355 Change 113355 by millert@millert_macbook on 2007/01/22 16:12:25 Back out thread labels (which were really just references to the parent task's label handle). It was a proof of concept that doesn't work well with the current label handle model. A real solution requires reference-counted labels that may be modified in-place. I have a design to do that but it is not likely to happen any time soon. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.c#11 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.h#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/task.c#10 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/thread.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/thread.h#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.c#11 (text+ko) ==== @@ -149,7 +149,7 @@ * Returned label handle is locked. */ ipc_labelh_t -labelh_modify(ipc_labelh_t old, int keepold) +labelh_modify(ipc_labelh_t old) { ipc_labelh_t lh; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.h#6 (text+ko) ==== @@ -45,7 +45,7 @@ void labelh_destroy(ipc_port_t port); ipc_labelh_t labelh_duplicate(ipc_labelh_t old); -ipc_labelh_t labelh_modify(ipc_labelh_t old, int keepold); +ipc_labelh_t labelh_modify(ipc_labelh_t old); ipc_labelh_t labelh_new(int canblock); kern_return_t labelh_new_user(ipc_space_t, struct label *, mach_port_name_t *); void labelh_release(ipc_labelh_t lh); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/task.c#10 (text+ko) ==== @@ -1696,35 +1696,10 @@ struct label *pl, struct task *task) { - thread_t thread; - ipc_labelh_t oldlabel; tasklabel_lock(task); - oldlabel = task->label; - - /* - * For each thread in the task, release a reference to the label - * handle in the thread if it matches the parent's. - * XXX - do we need to hold the task while this is going on? - */ - queue_iterate(&task->threads, thread, thread_t, task_threads) { - if (thread->label == oldlabel) - lh_release(oldlabel); - } - task->label = labelh_modify(task->label, 1); + task->label = labelh_modify(task->label); mac_task_label_update(pl, &task->maclabel); - /* - * Replace the old label in the task's threads with the new one. - */ - queue_iterate(&task->threads, thread, thread_t, task_threads) { - if (thread->label == oldlabel) { - thread->label = task->label; - lh_reference(task->label); - } - } - /* Free old label if it is no longer in use. */ - if (task->label != oldlabel) - lh_check_unlock(oldlabel); tasklabel_unlock(task); ip_lock(task->itk_self); mac_port_label_update_cred(pl, &task->itk_self->ip_label); @@ -1737,35 +1712,10 @@ void *arg, void (*f) (struct label *l, void *arg)) { - thread_t thread; - ipc_labelh_t oldlabel; tasklabel_lock(task); - oldlabel = task->label; - - /* - * For each thread in the task, release a reference to the label - * handle in the thread if it matches the parent's. - * XXX - do we need to hold the task while this is going on? - */ - queue_iterate(&task->threads, thread, thread_t, task_threads) { - if (thread->label == oldlabel) - lh_release(oldlabel); - } - task->label = labelh_modify(task->label, 1); + task->label = labelh_modify(task->label); (*f)(&task->maclabel, arg); - /* - * Replace the old label in the task's threads with the new one. - */ - queue_iterate(&task->threads, thread, thread_t, task_threads) { - if (thread->label == oldlabel) { - thread->label = task->label; - lh_reference(task->label); - } - } - /* Free old label if it is no longer in use. */ - if (task->label != oldlabel) - lh_check_unlock(oldlabel); tasklabel_unlock(task); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/thread.c#4 (text+ko) ==== @@ -391,10 +391,6 @@ machine_thread_destroy(thread); -#ifdef MAC - labelh_release(task->label); -#endif - zfree(thread_zone, thread); } @@ -669,11 +665,6 @@ new_thread->pri_shift = new_thread->processor_set->pri_shift; compute_priority(new_thread, FALSE); -#ifdef MAC - labelh_reference(parent_task->label); - new_thread->label = parent_task->label; -#endif - new_thread->active = TRUE; *out_thread = new_thread; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/thread.h#4 (text+ko) ==== @@ -122,9 +122,7 @@ #include #include #include -#include -#include #include #include @@ -357,10 +355,6 @@ #ifdef MACH_BSD void *uthread; #endif - -#ifdef MAC - ipc_labelh_t label; -#endif }; #define ith_state saved.receive.state From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:13:03 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B48516A51E; Mon, 22 Jan 2007 16:13:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EBA6516A4A7 for ; Mon, 22 Jan 2007 16:13:02 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E36E713C4B9 for ; Mon, 22 Jan 2007 16:13:01 +0000 (UTC) (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 l0MGD13G029131 for ; Mon, 22 Jan 2007 16:13:01 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGD1RJ029124 for perforce@freebsd.org; Mon, 22 Jan 2007 16:13:01 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:13:01 GMT Message-Id: <200701221613.l0MGD1RJ029124@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 113356 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:13:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=113356 Change 113356 by millert@millert_macbook on 2007/01/22 16:12:58 Implement mac_mbuf_label_associate_multicast_encap (could use a better name). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_mroute.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet6/ip6_mroute.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#37 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_net.c#12 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#45 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#72 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_mroute.c#5 (text+ko) ==== @@ -1601,10 +1601,8 @@ MGETHDR(mb_copy, M_DONTWAIT, MT_HEADER); if (mb_copy == NULL) return; -#ifdef __darwin8_notyet #ifdef MAC - mac_mbuf_create_multicast_encap(m, vifp->v_ifp, mb_copy); -#endif + mac_mbuf_label_associate_multicast_encap(m, vifp->v_ifp, mb_copy); #endif mb_copy->m_data += max_linkhdr; mb_copy->m_len = sizeof(multicast_encap_iphdr); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet6/ip6_mroute.c#4 (text+ko) ==== @@ -1569,10 +1569,8 @@ MGETHDR(mm, M_DONTWAIT, MT_HEADER); if (mm == NULL) return ENOBUFS; -#ifdef __darwin8_notyet #ifdef MAC - mac_mbuf_create_multicast_encap(m, mif->m6_ifp, mm); -#endif + mac_mbuf_label_associate_multicast_encap(m, mif->m6_ifp, mm); #endif mm->m_pkthdr.rcvif = NULL; mm->m_data += max_linkhdr; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#37 (text+ko) ==== @@ -185,6 +185,8 @@ void mac_mbuf_label_associate_inpcb(struct inpcb *inp, struct mbuf *m); void mac_mbuf_label_associate_ipq(struct ipq *ipq, struct mbuf *mbuf); void mac_mbuf_label_associate_linklayer(struct ifnet *ifp, struct mbuf *m); +void mac_mbuf_label_associate_multicast_encap(struct mbuf *oldmbuf, + struct ifnet *ifp, struct mbuf *newmbuf); void mac_mbuf_label_associate_netlayer(struct mbuf *oldmbuf, struct mbuf *newmbuf); void mac_mbuf_label_associate_socket(struct socket *so, struct mbuf *m); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_net.c#12 (text+ko) ==== @@ -335,6 +335,21 @@ } void +mac_mbuf_label_associate_multicast_encap(struct mbuf *oldmbuf, + struct ifnet *ifp, struct mbuf *newmbuf) +{ + struct label *oldmbuflabel, *newmbuflabel; + + oldmbuflabel = mac_mbuf_to_label(oldmbuf); + newmbuflabel = mac_mbuf_to_label(newmbuf); + + /* ifp must be locked */ + + MAC_PERFORM(mbuf_label_associate_multicast_encap, oldmbuf, oldmbuflabel, + ifp, ifp->if_label, newmbuf, newmbuflabel); +} + +void mac_mbuf_label_associate_netlayer(struct mbuf *oldmbuf, struct mbuf *newmbuf) { struct label *oldmbuflabel, *newmbuflabel; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#45 (text+ko) ==== @@ -1443,6 +1443,28 @@ ); /** @brief Assign a label to a new mbuf + @param oldmbuf mbuf headerder for existing datagram for existing datagram + @param oldmbuflabel Policy label for oldmbuf + @param ifp Network interface + @param ifplabel Policy label for ifp + @param newmbuf mbuf header to be labeled for new datagram + @param newmbuflabel Policy label for newmbuf + + Set the label on the mbuf header of a newly created datagram + generated from the existing passed datagram when it is processed + by the passed multicast encapsulation interface. This call is made + when an mbuf is to be delivered using the virtual interface. +*/ +typedef void mpo_mbuf_label_associate_multicast_encap_t( + struct mbuf *oldmbuf, + struct label *oldmbuflabel, + struct ifnet *ifp, + struct label *ifplabel, + struct mbuf *newmbuf, + struct label *newmbuflabel +); +/** + @brief Assign a label to a new mbuf @param oldmbuf Received datagram @param oldmbuflabel Policy label for oldmbuf @param newmbuf Newly created datagram @@ -5566,6 +5588,7 @@ mpo_mbuf_label_associate_inpcb_t *mpo_mbuf_label_associate_inpcb; mpo_mbuf_label_associate_ipq_t *mpo_mbuf_label_associate_ipq; mpo_mbuf_label_associate_linklayer_t *mpo_mbuf_label_associate_linklayer; + mpo_mbuf_label_associate_multicast_encap_t *mpo_mbuf_label_associate_multicast_encap; mpo_mbuf_label_associate_netlayer_t *mpo_mbuf_label_associate_netlayer; mpo_mbuf_label_associate_socket_t *mpo_mbuf_label_associate_socket; mpo_mbuf_label_copy_t *mpo_mbuf_label_copy; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#72 (text+ko) ==== @@ -953,6 +953,15 @@ } static void +sebsd_mbuf_label_associate_multicast_encap(struct mbuf *oldmbuf, + struct label *oldmbuflabel, struct mbuf *newmbuf, + struct label *newmbuflabel) +{ + + sebsd_label_copy(oldmbuflabel, newmbuflabel); +} + +static void sebsd_mbuf_label_associate_inpcb(struct inpcb *inp, struct label *ilabel, struct mbuf *m, struct label *mlabel) { @@ -3592,6 +3601,7 @@ .mpo_mbuf_label_associate_inpcb = sebsd_mbuf_label_associate_inpcb, .mpo_mbuf_label_associate_ipq = sebsd_mbuf_label_associate_ipq, .mpo_mbuf_label_associate_linklayer = sebsd_mbuf_label_associate_linklayer, + .mpo_mbuf_label_associate_multicast_encap = sebsd_mbuf_label_associate_multicast_encap, .mpo_mbuf_label_associate_netlayer = sebsd_mbuf_label_associate_netlayer, .mpo_mbuf_label_associate_socket = sebsd_mbuf_label_associate_socket, .mpo_mbuf_label_copy = sebsd_label_copy, From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:14:05 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C534416A407; Mon, 22 Jan 2007 16:14:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8720616A402 for ; Mon, 22 Jan 2007 16:14:04 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4B2C013C4BE for ; Mon, 22 Jan 2007 16:14:04 +0000 (UTC) (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 l0MGE3Ik029546 for ; Mon, 22 Jan 2007 16:14:03 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGE3CY029543 for perforce@freebsd.org; Mon, 22 Jan 2007 16:14:03 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:14:03 GMT Message-Id: <200701221614.l0MGE3CY029543@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 113357 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:14:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=113357 Change 113357 by millert@millert_macbook on 2007/01/22 16:13:27 Add missing arg to sebsd_log(). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#73 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#73 (text+ko) ==== @@ -1026,7 +1026,8 @@ */ if (security_transition_sid(tsec->sid, msqsec->sid, SECCLASS_MSG, &msgsec->sid) < 0) { - sebsd_log("%s: security_transition_sid failed, using task sid"); + sebsd_log("%s: security_transition_sid failed, using task sid", + __func__); msgsec->sid = tsec->sid; } } From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:14:05 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EFE816A50F; Mon, 22 Jan 2007 16:14:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id ED9F116A4C2 for ; Mon, 22 Jan 2007 16:14:04 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CAEB213C4C1 for ; Mon, 22 Jan 2007 16:14:04 +0000 (UTC) (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 l0MGE4L4029553 for ; Mon, 22 Jan 2007 16:14:04 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGE4km029550 for perforce@freebsd.org; Mon, 22 Jan 2007 16:14:04 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:14:04 GMT Message-Id: <200701221614.l0MGE4km029550@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 113358 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:14:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=113358 Change 113358 by millert@millert_macbook on 2007/01/22 16:13:49 Fix args to sebsd_mbuf_label_associate_multicast_encap(). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#74 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#74 (text+ko) ==== @@ -954,8 +954,8 @@ static void sebsd_mbuf_label_associate_multicast_encap(struct mbuf *oldmbuf, - struct label *oldmbuflabel, struct mbuf *newmbuf, - struct label *newmbuflabel) + struct label *oldmbuflabel, struct ifnet *ifp, struct label *ifplabel, + struct mbuf *newmbuf, struct label *newmbuflabel) { sebsd_label_copy(oldmbuflabel, newmbuflabel); From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:20:13 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2ADED16A402; Mon, 22 Jan 2007 16:20:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F336216A400 for ; Mon, 22 Jan 2007 16:20:12 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C0EEE13C448 for ; Mon, 22 Jan 2007 16:20:12 +0000 (UTC) (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 l0MGKCX8030018 for ; Mon, 22 Jan 2007 16:20:12 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGKCTG030015 for perforce@freebsd.org; Mon, 22 Jan 2007 16:20:12 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:20:12 GMT Message-Id: <200701221620.l0MGKCTG030015@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 113359 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:20:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=113359 Change 113359 by millert@millert_macbook on 2007/01/22 16:20:08 Add some more missing modification notices and mac_framework.h includes. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/bpf.h#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/ether_inet_pr_module.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_faith.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_gif.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_loop.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_stf.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/bpf.h#4 (text+ko) ==== @@ -69,6 +69,12 @@ * * $FreeBSD: src/sys/net/bpf.h,v 1.21.2.3 2001/08/01 00:23:13 fenner Exp $ */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce + * 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. + */ #ifndef _NET_BPF_H_ #define _NET_BPF_H_ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/ether_inet_pr_module.c#5 (text+ko) ==== @@ -60,9 +60,14 @@ * SUCH DAMAGE. * */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce + * 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. + */ - #include #include #include @@ -104,6 +109,10 @@ #include #endif /* NVLAN > 0 */ +#ifdef MAC +#include +#endif + /* Local function declerations */ int ether_attach_inet(struct ifnet *ifp, u_long proto_family); int ether_detach_inet(struct ifnet *ifp, u_long proto_family); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if.c#4 (text+ko) ==== @@ -62,6 +62,12 @@ * @(#)if.c 8.3 (Berkeley) 1/4/94 * $FreeBSD: src/sys/net/if.c,v 1.85.2.9 2001/07/24 19:10:17 brooks Exp $ */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce + * 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. + */ #include ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_faith.c#4 (text+ko) ==== @@ -68,6 +68,12 @@ * @(#)if_loop.c 8.1 (Berkeley) 6/10/93 * Id: if_loop.c,v 1.22 1996/06/19 16:24:10 wollman Exp */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce + * 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. + */ /* * Loopback interface driver for protocol testing and timing. @@ -113,6 +119,10 @@ #include +#ifdef MAC +#include +#endif + static int faithioctl(struct ifnet *, u_long, void*); int faith_pre_output(struct ifnet *, register struct mbuf **, const struct sockaddr *, caddr_t, char *, char *, u_long); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_gif.c#4 (text+ko) ==== @@ -58,6 +58,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce + * 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. + */ #include #include @@ -100,6 +106,10 @@ #include +#ifdef MAC +#include +#endif + #define GIFNAME "gif" #define GIFDEV "if_gif" #define GIF_MAXUNIT 0x7fff /* ifp->if_unit is only 15 bits */ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_loop.c#4 (text+ko) ==== @@ -62,6 +62,12 @@ * @(#)if_loop.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/net/if_loop.c,v 1.47.2.5 2001/07/03 11:01:41 ume Exp $ */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce + * 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. + */ /* * Loopback interface driver for protocol testing and timing. @@ -112,6 +118,10 @@ #include #endif +#ifdef MAC +#include +#endif + #define NLOOP_ATTACHMENTS (NLOOP * 12) struct lo_statics_str { ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/if_stf.c#3 (text+ko) ==== @@ -29,6 +29,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +/* + * NOTICE: This file was modified by SPARTA, Inc. in 2006 to introduce + * 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. + */ /* * 6to4 interface, based on RFC3056. @@ -109,6 +115,10 @@ #include +#ifdef MAC +#include +#endif + #define IN6_IS_ADDR_6TO4(x) (ntohs((x)->s6_addr16[0]) == 0x2002) #define GET_V4(x) ((struct in_addr *)(&(x)->s6_addr16[1])) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:21:15 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1457A16A402; Mon, 22 Jan 2007 16:21:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E737516A401 for ; Mon, 22 Jan 2007 16:21:14 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D60BC13C45E for ; Mon, 22 Jan 2007 16:21:14 +0000 (UTC) (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 l0MGLEPX030156 for ; Mon, 22 Jan 2007 16:21:14 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGLEln030153 for perforce@freebsd.org; Mon, 22 Jan 2007 16:21:14 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:21:14 GMT Message-Id: <200701221621.l0MGLEln030153@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 113360 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:21:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=113360 Change 113360 by millert@millert_macbook on 2007/01/22 16:20:34 Add includes, __unused and cast to quiet gcc warnings Add back code mistakenly removed during rc==22 (EINVAL) changes that broke mac_request_label(). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/security.c#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/security.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005, 2006 SPARTA, Inc. + * Copyright (c) 2005-2007 SPARTA, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -28,9 +28,11 @@ #include #include #include +#include #include #include #include +#include kern_return_t mach_get_task_label( @@ -98,7 +100,7 @@ kern_return_t mac_check_service( - ipc_space_t space, + __unused ipc_space_t space, labelstr_t subj, labelstr_t obj, labelstr_t serv, @@ -161,7 +163,7 @@ return kr; } - dead = ipc_right_check(space, entry->ie_object, obj, entry); + dead = ipc_right_check(space, (ipc_port_t) entry->ie_object, obj, entry); if (dead) { is_write_unlock(space); mac_task_label_destroy(&subjl); @@ -290,7 +292,11 @@ io_unlock(objp); ipc_port_multiple_unlock(); - kr = rc ? KERN_NO_ACCESS : KERN_SUCCESS; + if (rc == 0) + kr = labelh_new_user(space, &outl, outlabel); + else + kr = KERN_NO_ACCESS; + if (kr != KERN_SUCCESS) mac_port_label_destroy(&outl); From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:22:17 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DACA516A409; Mon, 22 Jan 2007 16:22:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B694E16A406 for ; Mon, 22 Jan 2007 16:22:16 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A4F9D13C4A6 for ; Mon, 22 Jan 2007 16:22:16 +0000 (UTC) (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 l0MGMG1Q030935 for ; Mon, 22 Jan 2007 16:22:16 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGMGWB030926 for perforce@freebsd.org; Mon, 22 Jan 2007 16:22:16 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:22:16 GMT Message-Id: <200701221622.l0MGMGWB030926@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 113361 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:22:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=113361 Change 113361 by millert@millert_macbook on 2007/01/22 16:21:45 Include the label pointer regardless of whether or not MAC is defined so the structs are always the same size. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/in_pcb.h#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_var.h#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/in_pcb.h#5 (text+ko) ==== @@ -116,6 +116,7 @@ * stable. */ struct icmp6_filter; +struct label; struct inpcb { LIST_ENTRY(inpcb) inp_hash; /* hash list */ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/ip_var.h#5 (text+ko) ==== @@ -84,6 +84,7 @@ }; #ifdef KERNEL_PRIVATE +struct label; /* * Ip reassembly queue structure. Each fragment * being reassembled is attached to one of these structures. @@ -99,10 +100,7 @@ struct in_addr ipq_src,ipq_dst; u_long ipq_nfrags; TAILQ_ENTRY(ipq) ipq_list; - u_long reserved[1]; /* for future use */ -#ifdef MAC struct label *ipq_label; /* MAC label */ -#endif #if IPDIVERT #ifdef IPDIVERT_44 u_int32_t ipq_div_info; /* ipfw divert port & flags */ From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:23:19 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D43FC16A40D; Mon, 22 Jan 2007 16:23:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9A31016A409 for ; Mon, 22 Jan 2007 16:23:18 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 88CA413C471 for ; Mon, 22 Jan 2007 16:23:18 +0000 (UTC) (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 l0MGNIJx031244 for ; Mon, 22 Jan 2007 16:23:18 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGNIl9031240 for perforce@freebsd.org; Mon, 22 Jan 2007 16:23:18 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:23:18 GMT Message-Id: <200701221623.l0MGNIl9031240@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 113362 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:23:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=113362 Change 113362 by millert@millert_macbook on 2007/01/22 16:22:40 Add address family and socket type to mac_ifnet_check_transmit() and mac_inpcb_check_deliver() so we have the info sedarwin needs to make policy decisions for ifnets. This requires a hack to find the socket type of an mbuf for mac_ifnet_check_transmit(). A better solution may be possible by changing where the entrypoint is called. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/dlil.c#7 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/raw_ip.c#8 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/tcp_input.c#8 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/udp_usrreq.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#38 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_inet.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_net.c#13 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#46 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/net/dlil.c#7 (text+ko) ==== @@ -1023,6 +1023,47 @@ return result; } +#ifdef MAC +#include +#include +static int dlil_get_socket_type(struct mbuf **mp, int family, int raw) +{ + struct mbuf *m; + struct ip *ip; + struct ip6_hdr *ip6; + int type = SOCK_RAW; + + if (!raw) { + switch (family) { + case PF_INET: + m = m_pullup(*mp, sizeof(struct ip)); + if (m == NULL) + break; + *mp = m; + ip = mtod(m, struct ip *); + if (ip->ip_p == IPPROTO_TCP) + type = SOCK_STREAM; + else if (ip->ip_p == IPPROTO_UDP) + type = SOCK_DGRAM; + break; + case PF_INET6: + m = m_pullup(*mp, sizeof(struct ip6_hdr)); + if (m == NULL) + break; + *mp = m; + ip6 = mtod(m, struct ip6_hdr *); + if (ip6->ip6_nxt == IPPROTO_TCP) + type = SOCK_STREAM; + else if (ip6->ip6_nxt == IPPROTO_UDP) + type = SOCK_DGRAM; + break; + } + } + + return (type); +} +#endif + int dlil_output_list( struct ifnet* ifp, @@ -1094,7 +1135,8 @@ do { #ifdef MAC - retval = mac_ifnet_check_transmit(ifp, m); + retval = mac_ifnet_check_transmit(ifp, m, proto_family, + dlil_get_socket_type(&m, proto_family, raw)); if (retval) { m_freem(m); goto cleanup; @@ -1227,7 +1269,8 @@ } #ifdef MAC - retval = mac_ifnet_check_transmit(ifp, m); + retval = mac_ifnet_check_transmit(ifp, m, proto_family, + dlil_get_socket_type(&m, proto_family, raw)); if (retval) { m_freem(m); goto cleanup; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/raw_ip.c#8 (text+ko) ==== @@ -228,7 +228,8 @@ #endif /*IPSEC*/ #ifdef MAC if (n && skipit == 0) { - if (mac_inpcb_check_deliver(last, n) != 0) + if (mac_inpcb_check_deliver(last, n, AF_INET, + SOCK_RAW) != 0) skipit = 1; } #endif @@ -277,7 +278,7 @@ #endif /*IPSEC*/ #ifdef MAC if (last && skipit == 0) { - if (mac_inpcb_check_deliver(last, m) != 0) + if (mac_inpcb_check_deliver(last, m, AF_INET, SOCK_RAW) != 0) skipit = 1; } #endif ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/tcp_input.c#8 (text+ko) ==== @@ -911,7 +911,7 @@ tiwin = th->th_win; #ifdef MAC - if (mac_inpcb_check_deliver(inp, m)) + if (mac_inpcb_check_deliver(inp, m, AF_INET, SOCK_STREAM)) goto drop; #endif ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/netinet/udp_usrreq.c#4 (text+ko) ==== @@ -697,7 +697,7 @@ struct mbuf *opts = 0; #ifdef MAC - if (mac_inpcb_check_deliver(last, n) != 0) { + if (mac_inpcb_check_deliver(last, n, AF_INET, SOCK_DGRAM) != 0) { m_freem(n); return; } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#38 (text+ko) ==== @@ -154,7 +154,8 @@ void mac_file_label_associate(struct ucred *cred, struct fileglob *fg); void mac_file_label_destroy(struct fileglob *fg); void mac_file_label_init(struct fileglob *fg); -int mac_ifnet_check_transmit(struct ifnet *ifp, struct mbuf *mbuf); +int mac_ifnet_check_transmit(struct ifnet *ifp, struct mbuf *mbuf, + int family, int type); void mac_ifnet_label_associate(struct ifnet *ifp); void mac_ifnet_label_destroy(struct ifnet *ifp); int mac_ifnet_label_get(struct ucred *cred, struct ifreq *ifr, @@ -163,7 +164,8 @@ void mac_ifnet_label_recycle(struct ifnet *ifp); int mac_ifnet_label_set(struct ucred *cred, struct ifreq *ifr, struct ifnet *ifp); -int mac_inpcb_check_deliver(struct inpcb *inp, struct mbuf *mbuf); +int mac_inpcb_check_deliver(struct inpcb *inp, struct mbuf *mbuf, + int family, int type); void mac_inpcb_label_associate(struct socket *so, struct inpcb *inp); void mac_inpcb_label_destroy(struct inpcb *inp); int mac_inpcb_label_init(struct inpcb *inp, int flag); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_inet.c#4 (text+ko) ==== @@ -246,7 +246,7 @@ } int -mac_inpcb_check_deliver(struct inpcb *inp, struct mbuf *m) +mac_inpcb_check_deliver(struct inpcb *inp, struct mbuf *m, int family, int type) { struct label *label; int error; @@ -256,7 +256,8 @@ label = mac_mbuf_to_label(m); - MAC_CHECK(inpcb_check_deliver, inp, inp->inp_label, m, label); + MAC_CHECK(inpcb_check_deliver, inp, inp->inp_label, m, label, + family, type); return (error); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_net.c#13 (text+ko) ==== @@ -377,7 +377,8 @@ } int -mac_ifnet_check_transmit(struct ifnet *ifp, struct mbuf *mbuf) +mac_ifnet_check_transmit(struct ifnet *ifp, struct mbuf *mbuf, int family, + int type) { struct label *label; int error; @@ -385,7 +386,8 @@ label = mac_mbuf_to_label(mbuf); ifnet_lock_shared(ifp); - MAC_CHECK(ifnet_check_transmit, ifp, ifp->if_label, mbuf, label); + MAC_CHECK(ifnet_check_transmit, ifp, ifp->if_label, mbuf, label, + family, type); ifnet_lock_done(ifp); return (error); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#46 (text+ko) ==== @@ -900,6 +900,8 @@ @param ifnetlabel Label of the network interfaces @param m The mbuf to be transmitted @param mbuflabel Label of the mbuf to be transmitted + @param family Address Family, AF_* + @param type Type of socket, SOCK_{STREAM,DGRAM,RAW} Determine whether the mbuf with label mbuflabel may be transmitted through the network interface represented by ifp that has the @@ -912,7 +914,9 @@ struct ifnet *ifp, struct label *ifnetlabel, struct mbuf *m, - struct label *mbuflabel + struct label *mbuflabel, + int family, + int type ); /** @brief Create a network interface label @@ -1036,6 +1040,8 @@ @param inplabel Label of the inpcb @param m The mbuf being received @param mbuflabel Label of the mbuf being received + @param family Address family, AF_* + @param type Type of socket, SOCK_{STREAM,DGRAM,RAW} Determine whether the mbuf with label mbuflabel may be received by the socket associated with inpcb that has the label inplabel. @@ -1047,7 +1053,9 @@ struct inpcb *inp, struct label *inplabel, struct mbuf *m, - struct label *mbuflabel + struct label *mbuflabel, + int family, + int type ); /** @brief Create an inpcb label From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:23:19 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4620916A401; Mon, 22 Jan 2007 16:23:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2378916A52F for ; Mon, 22 Jan 2007 16:23:19 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DCC4613C4BA for ; Mon, 22 Jan 2007 16:23:18 +0000 (UTC) (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 l0MGNIDX031254 for ; Mon, 22 Jan 2007 16:23:18 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGNIbu031248 for perforce@freebsd.org; Mon, 22 Jan 2007 16:23:18 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:23:18 GMT Message-Id: <200701221623.l0MGNIbu031248@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 113363 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:23:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=113363 Change 113363 by millert@millert_macbook on 2007/01/22 16:23:09 Adapt to mac_ifnet_check_transmit() and mac_inpcb_check_deliver() API change. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#75 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#75 (text+ko) ==== @@ -3125,18 +3125,33 @@ #endif static int -sebsd_ifnet_check_transmit(struct ifnet *ifp, - struct label *ifnetlabel, struct mbuf *m, struct label *mbuflabel) +sebsd_ifnet_check_transmit(struct ifnet *ifp, struct label *ifnetlabel, + struct mbuf *m, struct label *mbuflabel, int family, int type) { struct network_security_struct *ifsec, *msec; + u_int32_t perm; int error; ifsec = SLOT(ifnetlabel); msec = SLOT(mbuflabel); + /* XXX - other types of perm, see selinux_sock_rcv_skb_compat() */ + switch (type) { + case SOCK_STREAM: + perm = NETIF__TCP_SEND; + break; + case SOCK_DGRAM: + perm = NETIF__UDP_SEND; + break; + case SOCK_RAW: + default: + perm = NETIF__RAWIP_SEND; + break; + } + /* XXX - use an audit struct so we can log useful info */ - error = avc_has_perm(msec->sid, ifsec->sid, SECCLASS_PACKET, - PACKET__SEND, NULL); + error = avc_has_perm(msec->sid, ifsec->sid, SECCLASS_NETIF, + perm, NULL); return (error); } @@ -3157,18 +3172,33 @@ } static int -sebsd_inpcb_check_deliver(struct inpcb *inp, - struct label *inplabel, struct mbuf *m, struct label *mbuflabel) +sebsd_inpcb_check_deliver(struct inpcb *inp, struct label *inplabel, + struct mbuf *m, struct label *mbuflabel, int family, int type) { struct network_security_struct *ifsec, *msec; + u_int32_t perm; int error; ifsec = SLOT(inplabel); msec = SLOT(mbuflabel); + /* XXX - other types of perm, see selinux_sock_rcv_skb_compat() */ + switch (type) { + case SOCK_STREAM: + perm = NETIF__TCP_RECV; + break; + case SOCK_DGRAM: + perm = NETIF__UDP_RECV; + break; + case SOCK_RAW: + default: + perm = NETIF__RAWIP_RECV; + break; + } + /* XXX - use an audit struct so we can log useful info */ - error = avc_has_perm(msec->sid, ifsec->sid, SECCLASS_PACKET, - PACKET__RECV, NULL); + error = avc_has_perm(msec->sid, ifsec->sid, SECCLASS_NETIF, + perm, NULL); return (error); } From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:24:21 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E47F016A406; Mon, 22 Jan 2007 16:24:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BF54816A404 for ; Mon, 22 Jan 2007 16:24:20 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AE5DA13C469 for ; Mon, 22 Jan 2007 16:24:20 +0000 (UTC) (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 l0MGOK5q031666 for ; Mon, 22 Jan 2007 16:24:20 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGOKkr031663 for perforce@freebsd.org; Mon, 22 Jan 2007 16:24:20 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:24:20 GMT Message-Id: <200701221624.l0MGOKkr031663@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 113364 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:24:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=113364 Change 113364 by millert@millert_macbook on 2007/01/22 16:23:31 The parameter to avc_has_perm() in sebsd_inpcb_check_deliver() were backwards. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#76 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#76 (text+ko) ==== @@ -3197,7 +3197,7 @@ } /* XXX - use an audit struct so we can log useful info */ - error = avc_has_perm(msec->sid, ifsec->sid, SECCLASS_NETIF, + error = avc_has_perm(ifsec->sid, msec->sid, SECCLASS_NETIF, perm, NULL); return (error); } From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:24:21 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8128E16A4F8; Mon, 22 Jan 2007 16:24:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4722B16A400 for ; Mon, 22 Jan 2007 16:24:21 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2937F13C45A for ; Mon, 22 Jan 2007 16:24:21 +0000 (UTC) (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 l0MGOLrd031673 for ; Mon, 22 Jan 2007 16:24:21 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGOKvb031669 for perforce@freebsd.org; Mon, 22 Jan 2007 16:24:20 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:24:20 GMT Message-Id: <200701221624.l0MGOKvb031669@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 113365 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:24:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=113365 Change 113365 by millert@millert_macbook on 2007/01/22 16:24:15 We can't hold the spinlock to protect the avc log printf() for as long as we do since vn_getpath() may sleep. Go back to allocating a new log struct for each avc audit message and only hold the spinlock for the duration of the printf(), which is safe. As an optimization, keep a spare log struct to avoid allocating when we don't need to (and since we are not allowed to sleep). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#19 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.h#9 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc_audit.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/linux-compat.h#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#19 (text+ko) ==== @@ -270,10 +270,11 @@ lck_attr_setdefault(avc_lck_attr); /* no lock debugging */ /* allocate avc locks */ - avc_log_lock = lck_spin_alloc_init(avc_lck_grp, avc_lck_attr); avc_lock = lck_rw_alloc_init(avc_lck_grp, avc_lck_attr); notif_lock = lck_spin_alloc_init(avc_lck_grp, avc_lck_attr); + avc_audit_init(avc_lck_grp, avc_lck_attr); + for (i = 0; i < AVC_CACHE_SLOTS; i++) { LIST_INIT(&avc_cache.slots[i]); } @@ -603,7 +604,7 @@ return; } - ab = audit_log_start(); + ab = audit_log_start(current->audit_context, GFP_ATOMIC, AUDIT_AVC); if (!ab) return; /* audit_panic has been called */ audit_log_format(ab, "avc: %s ", denied ? "denied" : "granted"); ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.h#9 (text+ko) ==== @@ -140,5 +140,7 @@ DECLARE_PER_CPU(struct avc_cache_stats, avc_cache_stats); #endif +void avc_audit_init(lck_grp_t *avc_lck_grp, lck_attr_t *avc_lck_attr); + #endif /* _SELINUX_AVC_H_ */ ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc_audit.c#6 (text+ko) ==== @@ -38,8 +38,10 @@ #include #include +#include #include #include +#include /* * Emulate Linux audit API. @@ -52,16 +54,40 @@ struct sbuf sbuf; char buf[1024]; }; -static struct audit_buffer audit_buf; + +static zone_t avc_audit_zone; /* audit buffer zone */ +static struct audit_buffer *spare_buf; /* spare buffer */ + +void +avc_audit_init(lck_grp_t *avc_lck_grp, lck_attr_t *avc_lck_attr) +{ + + avc_log_lock = lck_spin_alloc_init(avc_lck_grp, avc_lck_attr); + avc_audit_zone = mac_zinit(sizeof(struct audit_buffer), + 512 * sizeof(struct audit_buffer), 0, "avc_audit"); + spare_buf = mac_zalloc(avc_audit_zone, M_WAITOK); +} struct audit_buffer * -audit_log_start(void) +_audit_log_start(int flag) { + struct audit_buffer *ab = spare_buf; - lck_spin_lock(avc_log_lock); - sbuf_new(&audit_buf.sbuf, audit_buf.buf, sizeof(audit_buf.buf), - SBUF_FIXEDLEN); - return (&audit_buf); + /* Use a free buffer if available, else alloc a new one. */ + if (ab != NULL) { + if (OSCompareAndSwap((UInt32)ab, 0, (UInt32 *)&spare_buf) == 0) + ab = NULL; + } + if (ab == NULL) { + ab = mac_zalloc(avc_audit_zone, flag); + if (ab == NULL) { + printf("%s: unable to allocate audit buffer\n", + __func__); + return (NULL); + } + } + sbuf_new(&ab->sbuf, ab->buf, sizeof(ab->buf), SBUF_FIXEDLEN); + return (ab); } void @@ -69,9 +95,13 @@ { sbuf_finish(&ab->sbuf); + lck_spin_lock(avc_log_lock); printf("\n%s\n", sbuf_data(&ab->sbuf)); - sbuf_delete(&ab->sbuf); /* XXX - not really needed */ lck_spin_unlock(avc_log_lock); + /* Always keep a free buffer around. */ + if (spare_buf != NULL || + OSCompareAndSwap(0, (UInt32)ab, (UInt32 *)&spare_buf) == 0) + mac_zfree(avc_audit_zone, ab); } void @@ -85,19 +115,6 @@ } void -sebsd_log(const char *fmt, ...) -{ - struct audit_buffer *ab; - va_list ap; - - ab = audit_log_start(); - va_start(ap, fmt); - sbuf_vprintf(&ab->sbuf, fmt, ap); - va_end(ap); - audit_log_end(ab); -} - -void audit_log_untrustedstring(struct audit_buffer *ab, const char *s) { ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/linux-compat.h#7 (text+ko) ==== @@ -137,12 +137,18 @@ /* emulate linux audit support */ extern lck_spin_t *avc_log_lock; struct audit_buffer; -struct audit_buffer *audit_log_start(void); -void sebsd_log(const char *, ...); +struct audit_buffer *_audit_log_start(int); void audit_log_end(struct audit_buffer *); void audit_log_format(struct audit_buffer *, const char *, ...); void audit_log_untrustedstring(struct audit_buffer *, const char *); -#define audit_log(ac, mf, af, ...) sebsd_log(__VA_ARGS__) +#define audit_log_start(ac, mf, af) _audit_log_start(mf) +#define audit_log(ac, mf, af, ...) do { \ + lck_spin_lock(avc_log_lock); \ + printf(__VA_ARGS__); \ + printf("\n"); \ + lck_spin_unlock(avc_log_lock); \ +} while (0) +#define sebsd_log(fmt, ...) printf(fmt "\n", __VA_ARGS__) /* we don't enable the selinux netlbl support */ #define selinux_netlbl_cache_invalidate() From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:25:23 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EE8916A404; Mon, 22 Jan 2007 16:25:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 14FE816A400 for ; Mon, 22 Jan 2007 16:25:23 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E6A0313C45A for ; Mon, 22 Jan 2007 16:25:22 +0000 (UTC) (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 l0MGPMtl031758 for ; Mon, 22 Jan 2007 16:25:22 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGPMCr031755 for perforce@freebsd.org; Mon, 22 Jan 2007 16:25:22 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:25:22 GMT Message-Id: <200701221625.l0MGPMCr031755@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 113366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:25:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=113366 Change 113366 by millert@millert_macbook on 2007/01/22 16:24:39 mac_vnode_check_access() now takes {R,W,X}_OK flags instead of V{READ,WRITE,EXEC}. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_attrlist.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_attrlist.c#5 (text+ko) ==== @@ -697,15 +697,15 @@ */ if (perms & W_OK) if (mac_vnode_check_access(vfs_context_ucred(ctx), - vp, VWRITE) != 0) + vp, W_OK) != 0) perms &= ~W_OK; if (perms & R_OK) if (mac_vnode_check_access(vfs_context_ucred(ctx), - vp, VREAD) != 0) + vp, R_OK) != 0) perms &= ~R_OK; if (perms & X_OK) if (mac_vnode_check_access(vfs_context_ucred(ctx), - vp, VEXEC) != 0) + vp, X_OK) != 0) perms &= ~X_OK; #endif /* MAC */ KAUTH_DEBUG("ATTRLIST - returning user access %x", perms); @@ -1195,15 +1195,15 @@ */ if (perms & W_OK) if (mac_vnode_check_access(vfs_context_ucred(&context), - vp, VWRITE) != 0) + vp, W_OK) != 0) perms &= ~W_OK; if (perms & R_OK) if (mac_vnode_check_access(vfs_context_ucred(&context), - vp, VREAD) != 0) + vp, R_OK) != 0) perms &= ~R_OK; if (perms & X_OK) if (mac_vnode_check_access(vfs_context_ucred(&context), - vp, VEXEC) != 0) + vp, X_OK) != 0) perms &= ~X_OK; #endif /* MAC */ VFS_DEBUG(ctx, vp, "ATTRLIST - granting perms %d", perms); From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:26:25 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 30E9716A408; Mon, 22 Jan 2007 16:26:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CAC4816A405 for ; Mon, 22 Jan 2007 16:26:24 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B814A13C474 for ; Mon, 22 Jan 2007 16:26:24 +0000 (UTC) (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 l0MGQOKE031958 for ; Mon, 22 Jan 2007 16:26:24 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGQOTw031955 for perforce@freebsd.org; Mon, 22 Jan 2007 16:26:24 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:26:24 GMT Message-Id: <200701221626.l0MGQOTw031955@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 113367 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:26:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=113367 Change 113367 by millert@millert_macbook on 2007/01/22 16:25:40 Add audit info for sockets and network interfaces. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/config/MACFramework.exports#9 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#20 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.h#10 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#77 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/config/MACFramework.exports#9 (text+ko) ==== @@ -25,6 +25,7 @@ _kauth_cred_dup_add _sotoxsocket +_ip6_sprintf _mac_kalloc _mac_kfree ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#20 (text+ko) ==== @@ -31,6 +31,10 @@ #include #include +#include +#include +#include + #ifdef CAPABILITIES #include #endif @@ -543,26 +547,27 @@ return node; } -#ifdef __linux__ static inline void avc_print_ipv6_addr(struct audit_buffer *ab, struct in6_addr *addr, __be16 port, - char *name1, char *name2) + const char *name1, const char *name2) { - if (!ipv6_addr_any(addr)) - audit_log_format(ab, " %s=" NIP6_FMT, name1, NIP6(*addr)); + if (!IN6_IS_ADDR_UNSPECIFIED(addr)) + audit_log_format(ab, " %s=%s", name1, ip6_sprintf(addr)); if (port) audit_log_format(ab, " %s=%d", name2, ntohs(port)); } static inline void avc_print_ipv4_addr(struct audit_buffer *ab, u32 addr, - __be16 port, char *name1, char *name2) + __be16 port, const char *name1, + const char *name2) { - if (addr) - audit_log_format(ab, " %s=" NIPQUAD_FMT, name1, NIPQUAD(addr)); + if (addr != INADDR_ANY) + audit_log_format(ab, " %s=%ld.%ld.%ld.%ld", name1, + (ntohl(addr)>>24)&0xFF, (ntohl(addr)>>16)&0xFF, + (ntohl(addr)>>8)&0xFF, (ntohl(addr))&0xFF); if (port) audit_log_format(ab, " %s=%d", name2, ntohs(port)); } -#endif /* __linux__ */ /** * avc_audit - Audit the granting or denial of permissions. @@ -680,8 +685,7 @@ break; case AVC_AUDIT_DATA_NET: #ifdef __linux__ - /* XXX - convert to xsocket */ - if (a->u.net.sk) { + if (a->u.net.xso) { struct sock *sk = a->u.net.sk; struct unix_sock *u; int len = 0; @@ -731,6 +735,7 @@ break; } } +#endif /* __linux__ */ switch (a->u.net.family) { case AF_INET: @@ -751,9 +756,8 @@ break; } if (a->u.net.netif) - audit_log_format(ab, " netif=%s", - a->u.net.netif); -#endif /* __linux__ */ + audit_log_format(ab, " netif=%s%d", + a->u.net.netif, a->u.net.netif_unit); break; case AVC_AUDIT_DATA_MIG: audit_log_format(ab, " msgid=%d", a->u.ipc_id); ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.h#10 (text+ko) ==== @@ -54,7 +54,8 @@ int pathlen; } fs; struct { - char *netif; + const char *netif; + u32 netif_unit; struct xsocket *xso; u16 family; u16 dport; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#77 (text+ko) ==== @@ -505,19 +505,21 @@ } static int -socket_has_perm(struct ucred *cred, struct label *socklabel, u_int32_t perm) +socket_has_perm(struct ucred *cred, struct label *socklabel, u_int32_t perm, + struct xsocket *xso) { struct task_security_struct *tsec; struct network_security_struct *nsec; + struct avc_audit_data ad; tsec = SLOT(cred->cr_label); nsec = SLOT(socklabel); - /* - * TBD: No audit information yet - */ + AVC_AUDIT_DATA_INIT(&ad, NET); + ad.u.net.xso = xso; + ad.u.net.family = xso->xso_family; - return (avc_has_perm(tsec->sid, nsec->sid, SECCLASS_SOCKET, perm, NULL)); + return (avc_has_perm(tsec->sid, nsec->sid, SECCLASS_SOCKET, perm, &ad)); } static void @@ -2547,7 +2549,7 @@ } /* XXX - SELinux just uses plain old SOCKET__ACCEPT */ - return (socket_has_perm(cred, socklabel, perm)); + return (socket_has_perm(cred, socklabel, perm, xso)); } static int @@ -2574,6 +2576,9 @@ /* XXX - unix domain socket-specific checks too? */ + AVC_AUDIT_DATA_INIT(&ad, NET); + ad.u.net.family = xso->xso_family; + /* * Note that we use the xso_family instead of sa_family since * the latter has not been sanity checked yet. @@ -2581,20 +2586,21 @@ if (xso->xso_family == AF_INET) { sin = (struct sockaddr_in *)addr; port = ntohs(sin->sin_port); + ad.u.net.sport = sin->sin_port; + ad.u.net.fam.v4.saddr = sin->sin_addr.s_addr; } else /* if (xso->xso_family == AF_INET6) */ { sin6 = (struct sockaddr_in6 *)addr; port = ntohs(sin6->sin6_port); + ad.u.net.sport = sin6->sin6_port; + memcpy(&ad.u.net.fam.v6.saddr, &sin6->sin6_addr, + sizeof(struct in6_addr)); } if (port) { - /* XXX - check against net.inet.ip.portrange.last? */ error = security_port_sid(xso->xso_family, xso->so_type, xso->xso_protocol, port, &sid); if (error) return (error); - AVC_AUDIT_DATA_INIT(&ad, NET); - ad.u.net.sport = htons(port); - ad.u.net.family = xso->xso_family; error = avc_has_perm(nsec->sid, sid, nsec->sclass, SOCKET__NAME_BIND, &ad); if (error) @@ -2616,10 +2622,6 @@ if (error) return (error); - AVC_AUDIT_DATA_INIT(&ad, NET); - ad.u.net.sport = htons(port); - ad.u.net.family = xso->xso_family; - if (xso->xso_family == AF_INET) ad.u.net.v4info.saddr = sin->sin_addr.s_addr; else @@ -2643,7 +2645,7 @@ u_int32_t sid; int error; - error = socket_has_perm(cred, socklabel, SOCKET__CONNECT); + error = socket_has_perm(cred, socklabel, SOCKET__CONNECT, xso); if (error) return (error); @@ -2715,7 +2717,7 @@ struct xsocket *xso, struct label *socklabel) { - return (socket_has_perm(cred, socklabel, SOCKET__POLL)); + return (socket_has_perm(cred, socklabel, SOCKET__POLL, xso)); } #endif @@ -2724,7 +2726,7 @@ struct label *socklabel) { - return (socket_has_perm(cred, socklabel, SOCKET__LISTEN)); + return (socket_has_perm(cred, socklabel, SOCKET__LISTEN, xso)); } static int @@ -2732,7 +2734,7 @@ struct label *socklabel) { - return (socket_has_perm(cred, socklabel, SOCKET__READ)); + return (socket_has_perm(cred, socklabel, SOCKET__READ, xso)); } static int @@ -2767,7 +2769,7 @@ struct label *socklabel, int which) { - return (socket_has_perm(cred, socklabel, SOCKET__POLL)); + return (socket_has_perm(cred, socklabel, SOCKET__POLL, xso)); } #endif @@ -2776,7 +2778,7 @@ struct label *socklabel) { - return (socket_has_perm(cred, socklabel, SOCKET__WRITE)); + return (socket_has_perm(cred, socklabel, SOCKET__WRITE, xso)); } static int @@ -2784,7 +2786,7 @@ struct label *socklabel) { - return (socket_has_perm(cred, socklabel, SOCKET__GETATTR)); + return (socket_has_perm(cred, socklabel, SOCKET__GETATTR, xso)); } static int @@ -3129,12 +3131,19 @@ struct mbuf *m, struct label *mbuflabel, int family, int type) { struct network_security_struct *ifsec, *msec; + struct avc_audit_data ad; u_int32_t perm; int error; ifsec = SLOT(ifnetlabel); msec = SLOT(mbuflabel); + AVC_AUDIT_DATA_INIT(&ad, NET); + ad.u.net.netif = ifnet_name(ifp); + ad.u.net.netif_unit = ifnet_unit(ifp); + ad.u.net.family = family; + /* XXX - if_index too? */ + /* XXX - other types of perm, see selinux_sock_rcv_skb_compat() */ switch (type) { case SOCK_STREAM: @@ -3149,9 +3158,8 @@ break; } - /* XXX - use an audit struct so we can log useful info */ error = avc_has_perm(msec->sid, ifsec->sid, SECCLASS_NETIF, - perm, NULL); + perm, &ad); return (error); } From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:31:34 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E75816A40D; Mon, 22 Jan 2007 16:31:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 27C6016A409 for ; Mon, 22 Jan 2007 16:31:34 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id F23F813C4C7 for ; Mon, 22 Jan 2007 16:31:33 +0000 (UTC) (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 l0MGVVHr032587 for ; Mon, 22 Jan 2007 16:31:31 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGVVFg032575 for perforce@freebsd.org; Mon, 22 Jan 2007 16:31:31 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:31:31 GMT Message-Id: <200701221631.l0MGVVFg032575@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 113368 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:31:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=113368 Change 113368 by millert@millert_macbook on 2007/01/22 16:30:34 Delete old launchd Makefile stuff. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/Makefile#2 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/Makefile.postamble#3 delete .. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/Makefile.preamble#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:31:35 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F0ECF16A410; Mon, 22 Jan 2007 16:31:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C907616A400 for ; Mon, 22 Jan 2007 16:31:34 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 832E413C4E9 for ; Mon, 22 Jan 2007 16:31:34 +0000 (UTC) (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 l0MGVVGN032598 for ; Mon, 22 Jan 2007 16:31:31 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGVV6F032592 for perforce@freebsd.org; Mon, 22 Jan 2007 16:31:31 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:31:31 GMT Message-Id: <200701221631.l0MGVV6F032592@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 113369 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:31:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=113369 Change 113369 by millert@millert_macbook on 2007/01/22 16:31:13 BSD Makefile rules for MiG Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/build/bsd.mig.mk#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:32:34 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2220C16A409; Mon, 22 Jan 2007 16:32:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 000F116A406 for ; Mon, 22 Jan 2007 16:32:33 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C330B13C4C6 for ; Mon, 22 Jan 2007 16:32:33 +0000 (UTC) (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 l0MGWXCI033080 for ; Mon, 22 Jan 2007 16:32:33 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGWXCA033075 for perforce@freebsd.org; Mon, 22 Jan 2007 16:32:33 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:32:33 GMT Message-Id: <200701221632.l0MGWXCA033075@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 113370 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:32:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=113370 Change 113370 by millert@millert_macbook on 2007/01/22 16:32:32 Fix mis-merge in @113355. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.c#12 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.c#12 (text+ko) ==== @@ -162,8 +162,7 @@ return (old); lh = labelh_duplicate(old); lh_release(old); - if (!keepold) - lh_check_unlock(old); + lh_check_unlock(old); lh_lock(lh); return (lh); } From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:35:38 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A69A16A402; Mon, 22 Jan 2007 16:35:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0B41716A407 for ; Mon, 22 Jan 2007 16:35:38 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D657013C4C4 for ; Mon, 22 Jan 2007 16:35:37 +0000 (UTC) (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 l0MGZbVO033751 for ; Mon, 22 Jan 2007 16:35:37 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGZbt0033748 for perforce@freebsd.org; Mon, 22 Jan 2007 16:35:37 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:35:37 GMT Message-Id: <200701221635.l0MGZbt0033748@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 113371 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:35:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=113371 Change 113371 by millert@millert_macbook on 2007/01/22 16:35:19 Remove extra space in audit log info. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#21 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#21 (text+ko) ==== @@ -614,7 +614,7 @@ return; /* audit_panic has been called */ audit_log_format(ab, "avc: %s ", denied ? "denied" : "granted"); avc_dump_av(ab, tclass,audited); - audit_log_format(ab, " for "); + audit_log_format(ab, " for"); if (a && a->tsk) tsk = a->tsk; else From owner-p4-projects@FreeBSD.ORG Mon Jan 22 16:36:40 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F54316A407; Mon, 22 Jan 2007 16:36:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E19B716A405 for ; Mon, 22 Jan 2007 16:36:39 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B809D13C471 for ; Mon, 22 Jan 2007 16:36:39 +0000 (UTC) (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 l0MGadVC033850 for ; Mon, 22 Jan 2007 16:36:39 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGadDo033847 for perforce@freebsd.org; Mon, 22 Jan 2007 16:36:39 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:36:39 GMT Message-Id: <200701221636.l0MGadDo033847@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 113372 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 16:36:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=113372 Change 113372 by millert@millert_macbook on 2007/01/22 16:35:56 Swap position of sid and osid in struct sebsd_label. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_labels.h#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_labels.h#8 (text+ko) ==== @@ -42,8 +42,8 @@ #define _SYS_SECURITY_SEBSD_LABELS_H struct sebsd_label { + u_int32_t sid; u_int32_t osid; /* task_sid for all but task_security_struct */ - u_int32_t sid; u_int16_t sclass; u_int16_t behavior; /* only used for mount */ }; From owner-p4-projects@FreeBSD.ORG Mon Jan 22 19:07:49 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33CCE16A407; Mon, 22 Jan 2007 19:07:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EB0A116A401 for ; Mon, 22 Jan 2007 19:07:48 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DB80113C4C9 for ; Mon, 22 Jan 2007 19:07:48 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0MJ7mZK074430 for ; Mon, 22 Jan 2007 19:07:48 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MJ7mAq074427 for perforce@freebsd.org; Mon, 22 Jan 2007 19:07:48 GMT (envelope-from sam@freebsd.org) Date: Mon, 22 Jan 2007 19:07:48 GMT Message-Id: <200701221907.l0MJ7mAq074427@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 113375 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 19:07:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=113375 Change 113375 by sam@sam_ebb on 2007/01/22 19:07:03 o remove hack channel mapping for psb; we don't need it now that we can uniquely identify a channel o key psb mapping on frequency; may need to also use the regdomain/sku but I think this is good for now o add channel width to ieee80211_announce_channels Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211.c#39 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211.c#39 (text+ko) ==== @@ -303,7 +303,7 @@ static __inline int mappsb(u_int freq, u_int flags) { - return 37 + ((freq * 10) + ((freq % 5) == 2 ? 5 : 0) - 49400) / 5; + return ((freq * 10) + (((freq % 5) == 2) ? 5 : 0) - 49400) / 5; } /* @@ -312,6 +312,7 @@ int ieee80211_mhz2ieee(u_int freq, u_int flags) { +#define IS_FREQ_IN_PSB(_freq) ((_freq) > 4940 && (_freq) < 4990) if (flags & IEEE80211_CHAN_GSM) return mapgsm(freq, flags); if (flags & IEEE80211_CHAN_2GHZ) { /* 2GHz band */ @@ -323,7 +324,8 @@ return 15 + ((freq - 2512) / 20); } else if (flags & IEEE80211_CHAN_5GHZ) { /* 5Ghz band */ if (freq <= 5000) { - if (flags &(IEEE80211_CHAN_HALF|IEEE80211_CHAN_QUARTER)) + /* XXX check regdomain? */ + if (IS_FREQ_IN_PSB(freq)) return mappsb(freq, flags); return (freq - 4000) / 5; } else @@ -337,7 +339,7 @@ return ((int) freq - 2407) / 5; } if (freq < 5000) { - if (flags &(IEEE80211_CHAN_HALF|IEEE80211_CHAN_QUARTER)) + if (IS_FREQ_IN_PSB(freq)) return mappsb(freq, flags); else if (freq > 4900) return (freq - 4000) / 5; @@ -346,6 +348,7 @@ } return (freq - 5000) / 5; } +#undef IS_FREQ_IN_PSB } /* @@ -584,9 +587,9 @@ { const struct ieee80211_channel *c; char type; - int i; + int i, cw; - printf("Chan Freq RegPwr MinPwr MaxPwr\n"); + printf("Chan Freq CW RegPwr MinPwr MaxPwr\n"); for (i = 0; i < ic->ic_nchans; i++) { c = &ic->ic_channels[i]; if (IEEE80211_IS_CHAN_ST(c)) @@ -603,8 +606,15 @@ type = 'b'; else type = 'f'; - printf("%4d %4d%c %6d %6d %6d\n" + if (IEEE80211_IS_CHAN_HALF(c)) + cw = 10; + else if (IEEE80211_IS_CHAN_QUARTER(c)) + cw = 5; + else + cw = 20; + printf("%4d %4d%c %2d %6d %6d %6d\n" , c->ic_ieee, c->ic_freq, type + , cw , c->ic_maxregpower , c->ic_minpower, c->ic_maxpower ); From owner-p4-projects@FreeBSD.ORG Mon Jan 22 19:08:51 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4B5916A407; Mon, 22 Jan 2007 19:08:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9AAF416A402 for ; Mon, 22 Jan 2007 19:08:50 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8B4C213C45E for ; Mon, 22 Jan 2007 19:08:50 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0MJ8oZa074461 for ; Mon, 22 Jan 2007 19:08:50 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MJ8ol0074458 for perforce@freebsd.org; Mon, 22 Jan 2007 19:08:50 GMT (envelope-from sam@freebsd.org) Date: Mon, 22 Jan 2007 19:08:50 GMT Message-Id: <200701221908.l0MJ8ol0074458@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 113376 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 19:08:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=113376 Change 113376 by sam@sam_ebb on 2007/01/22 19:08:39 remove hack mapping of psb channel #'s; we're ready to use the real thing Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#129 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#129 (text+ko) ==== @@ -5453,11 +5453,6 @@ ath_getchannels(struct ath_softc *sc, HAL_REG_DOMAIN rd, HAL_CTRY_CODE cc, HAL_BOOL outdoor, HAL_BOOL xchanmode) { -#define COMPAT \ - (CHANNEL_ALL_NOTURBO|CHANNEL_PASSIVE|CHANNEL_HALF|CHANNEL_QUARTER) -#define IS_CHAN_PUBLIC_SAFETY(_c) \ - (((_c)->channelFlags & CHANNEL_5GHZ) && \ - ((_c)->channel > 4940 && (_c)->channel < 4990)) struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = sc->sc_ifp; struct ath_hal *ah = sc->sc_ah; @@ -5488,9 +5483,11 @@ HAL_CHANNEL *c = &chans[i]; struct ieee80211_channel *ichan = &ic->ic_channels[i]; - ichan->ic_ieee = ath_hal_mhz2ieee(ah, c->channel, c->channelFlags); - if (IS_CHAN_PUBLIC_SAFETY(c)) - ichan->ic_ieee += 37; /* XXX */ + ichan->ic_ieee = ath_hal_mhz2ieee(ah, c->channel, + c->channelFlags); + if (bootverbose) + if_printf(ifp, "hal channel %u/%x -> %u\n", + c->channel, c->channelFlags, ichan->ic_ieee); ichan->ic_freq = c->channel; ichan->ic_flags = c->channelFlags; if (ath_hal_isgsmsku(ah)) { @@ -5498,7 +5495,7 @@ ichan->ic_freq = 922 + (2422 - ichan->ic_freq); ichan->ic_flags |= IEEE80211_CHAN_GSM; ichan->ic_ieee = ieee80211_mhz2ieee(ichan->ic_freq, - ichan->ic_flags); + ichan->ic_flags); } ichan->ic_maxregpower = c->maxRegTxPower; /* dBm */ ichan->ic_maxpower = c->maxTxPower / 2; /* 1/2 dBm */ @@ -5511,8 +5508,6 @@ sc->sc_xchanmode = xchanmode; sc->sc_outdoor = outdoor; return 0; -#undef IS_CHAN_PUBLIC_SAFETY -#undef COMPAT } static void From owner-p4-projects@FreeBSD.ORG Mon Jan 22 19:44:36 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D13E916A404; Mon, 22 Jan 2007 19:44:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A26CE16A401 for ; Mon, 22 Jan 2007 19:44:35 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 926AA13C46A for ; Mon, 22 Jan 2007 19:44:35 +0000 (UTC) (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 l0MJiZYP081024 for ; Mon, 22 Jan 2007 19:44:35 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MJiZrf081021 for perforce@freebsd.org; Mon, 22 Jan 2007 19:44:35 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 19:44:35 GMT Message-Id: <200701221944.l0MJiZrf081021@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 113378 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 19:44:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=113378 Change 113378 by millert@millert_macbook on 2007/01/22 19:43:50 Allow getattr on tmp_t. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/diskarbitrationd.te#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/diskarbitrationd.te#8 (text+ko) ==== @@ -40,6 +40,7 @@ kernel_allow_ipc(fsadm_t) mach_allow_message(fsadm_t, fsadm_t) allow fsadm_t device_t:chr_file { getattr ioctl read write }; +files_getattr_tmp_dirs(diskarbitrationd_t) # Misc allow diskarbitrationd_t self:process signal; From owner-p4-projects@FreeBSD.ORG Mon Jan 22 19:44:37 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A850916A4F8; Mon, 22 Jan 2007 19:44:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0742816A4AB for ; Mon, 22 Jan 2007 19:44:36 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CD4F513C478 for ; Mon, 22 Jan 2007 19:44:35 +0000 (UTC) (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 l0MJiZk3081031 for ; Mon, 22 Jan 2007 19:44:35 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MJiZ4N081027 for perforce@freebsd.org; Mon, 22 Jan 2007 19:44:35 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 19:44:35 GMT Message-Id: <200701221944.l0MJiZ4N081027@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 113379 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 19:44:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=113379 Change 113379 by millert@millert_macbook on 2007/01/22 19:44:10 Read files as well as dirs for darwin_allow_system_read(). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.if#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.if#5 (text+ko) ==== @@ -136,6 +136,7 @@ ') allow $1 darwin_system_t:dir r_dir_perms; + allow $1 darwin_system_t:file read_file_perms; ') From owner-p4-projects@FreeBSD.ORG Mon Jan 22 19:47:40 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8662416A414; Mon, 22 Jan 2007 19:47:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4974516A411 for ; Mon, 22 Jan 2007 19:47:40 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 206B613C44B for ; Mon, 22 Jan 2007 19:47:40 +0000 (UTC) (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 l0MJldRN081353 for ; Mon, 22 Jan 2007 19:47:40 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MJldGU081350 for perforce@freebsd.org; Mon, 22 Jan 2007 19:47:39 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 19:47:39 GMT Message-Id: <200701221947.l0MJldGU081350@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 113380 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 19:47:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=113380 Change 113380 by millert@millert_macbook on 2007/01/22 19:47:33 Handle directory privs for modutils_read_module_deps. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/modutils.if#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/modutils.if#4 (text+ko) ==== @@ -16,6 +16,7 @@ ') files_list_kernel_modules($1) + allow $1 modules_dep_t:dir { read search getattr }; allow $1 modules_dep_t:file r_file_perms; ') From owner-p4-projects@FreeBSD.ORG Mon Jan 22 19:48:42 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5672616A407; Mon, 22 Jan 2007 19:48:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1C69916A402 for ; Mon, 22 Jan 2007 19:48:42 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0104713C459 for ; Mon, 22 Jan 2007 19:48:42 +0000 (UTC) (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 l0MJmf9E081546 for ; Mon, 22 Jan 2007 19:48:41 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MJmfGt081540 for perforce@freebsd.org; Mon, 22 Jan 2007 19:48:41 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 19:48:41 GMT Message-Id: <200701221948.l0MJmfGt081540@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 113381 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 19:48:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=113381 Change 113381 by millert@millert_macbook on 2007/01/22 19:48:33 Handle set_special_port in a generic manner. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/DirectoryService.te#7 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.te#9 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#10 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.te#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/diskarbitrationd.te#9 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/kextd.te#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#7 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/lookupd.te#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/mach.te#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/DirectoryService.te#7 (text+ko) ==== @@ -67,7 +67,6 @@ allow DirectoryService_t sbin_t:dir { getattr search read }; allow DirectoryService_t port_t:tcp_socket name_connect; allow DirectoryService_t self:fifo_file { getattr ioctl }; -allow DirectoryService_t self:mach_task set_special_port; allow DirectoryService_t self:process signal; allow DirectoryService_t self:socket create; allow DirectoryService_t bin_t:dir search; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.te#9 (text+ko) ==== @@ -89,7 +89,6 @@ allow WindowServer_t nfs_t:lnk_file read; allow WindowServer_t nfs_t:dir search; allow WindowServer_t mnt_t:dir search; -allow WindowServer_t self:mach_task set_special_port; allow WindowServer_t self:process { setsched signal }; allow WindowServer_t self:shm { create getattr read setattr write }; allow WindowServer_t bin_t:dir search; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#10 (text+ko) ==== @@ -63,7 +63,6 @@ allow configd_t bin_t:file { execute_no_trans getattr read }; allow configd_t self:fd use; allow configd_t self:fifo_file getattr; -allow configd_t self:mach_task set_special_port; allow configd_t self:process { setsched signal }; allow configd_t self:rawip_socket create; allow configd_t self:socket { bind create listen read write }; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.te#3 (text+ko) ==== @@ -27,7 +27,6 @@ # Talk to self mach_allow_message(coreservicesd_t, coreservicesd_t) -allow coreservicesd_t self:mach_task set_special_port; allow coreservicesd_t self:process signal; allow coreservicesd_t self:shm { create read setattr write }; allow coreservicesd_t self:udp_socket create; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/diskarbitrationd.te#9 (text+ko) ==== @@ -48,8 +48,6 @@ allow diskarbitrationd_t self:udp_socket create; allow diskarbitrationd_t self:unix_dgram_socket create; allow diskarbitrationd_t sbin_t:dir search; -allow diskarbitrationd_t self:mach_task set_special_port; - # Allow disk/device/fs operations allow diskarbitrationd_t device_t:chr_file { ioctl read }; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/kextd.te#6 (text+ko) ==== @@ -39,7 +39,6 @@ # Talk to self mach_allow_message(kextd_t, kextd_t) -allow kextd_t self:mach_task set_special_port; allow kextd_t self:process signal; allow kextd_t self:udp_socket create; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#7 (text+ko) ==== @@ -31,7 +31,6 @@ allow loginwindow_t console_device_t:chr_file { read setattr write }; allow loginwindow_t lib_t:file execute_no_trans; allow loginwindow_t self:fd use; -allow loginwindow_t self:mach_task set_special_port; allow loginwindow_t self:process { taskforpid signal }; # XXX allow loginwindow_t self:shm { create read setattr write }; allow loginwindow_t self:socket { connect write }; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/lookupd.te#5 (text+ko) ==== @@ -42,7 +42,6 @@ allow lookupd_t self:udp_socket create; allow lookupd_t self:tcp_socket create; allow lookupd_t self:unix_dgram_socket create; -allow lookupd_t self:mach_task set_special_port; # Misc ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#6 (text+ko) ==== @@ -29,7 +29,6 @@ allow securityd_t self:unix_stream_socket create_stream_socket_perms; # Talk to self -allow securityd_t self:mach_task set_special_port; allow securityd_t self:process signal; allow securityd_t self:socket { connect write }; allow securityd_t self:udp_socket create; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/mach.te#2 (text+ko) ==== @@ -10,4 +10,4 @@ class mach_port app_mach_port_perms; ') - +allow domain self:mach_task set_special_port; From owner-p4-projects@FreeBSD.ORG Mon Jan 22 19:51:46 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A307316A405; Mon, 22 Jan 2007 19:51:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7EA3316A400 for ; Mon, 22 Jan 2007 19:51:46 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6F54A13C45B for ; Mon, 22 Jan 2007 19:51:46 +0000 (UTC) (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 l0MJpk9M083601 for ; Mon, 22 Jan 2007 19:51:46 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MJpjf9083598 for perforce@freebsd.org; Mon, 22 Jan 2007 19:51:45 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 19:51:45 GMT Message-Id: <200701221951.l0MJpjf9083598@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 113382 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 19:51:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=113382 Change 113382 by millert@millert_macbook on 2007/01/22 19:50:57 Labels for /var/vm. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/files.fc#7 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/files.te#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/files.fc#7 (text+ko) ==== @@ -102,3 +102,5 @@ /private/var/tmp/lost\+found -d gen_context(system_u:object_r:lost_found_t,mls_systemhigh) /private/var/tmp/lost\+found/.* <> /private/var/tmp/vi\.recover -d gen_context(system_u:object_r:tmp_t,s0) + +/private/var/vm -d gen_context(system_u:object_r:var_vm_t,s0) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/files.te#4 (text+ko) ==== @@ -173,6 +173,11 @@ type var_spool_t; files_tmp_file(var_spool_t) +# +# var_vm_t is the type of /var/vm +# +type var_vm_t; + ######################################## # # Rules for all file types From owner-p4-projects@FreeBSD.ORG Mon Jan 22 19:52:48 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9046116A40F; Mon, 22 Jan 2007 19:52:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5651616A405 for ; Mon, 22 Jan 2007 19:52:48 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 46E1413C457 for ; Mon, 22 Jan 2007 19:52:48 +0000 (UTC) (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 l0MJqmVL083855 for ; Mon, 22 Jan 2007 19:52:48 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MJqm4Y083851 for perforce@freebsd.org; Mon, 22 Jan 2007 19:52:48 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 19:52:48 GMT Message-Id: <200701221952.l0MJqm4Y083851@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 113383 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 19:52:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=113383 Change 113383 by millert@millert_macbook on 2007/01/22 19:52:03 Update to deal with /var/vm/swapfile* transition and labeling. Allow other activities. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/dynamic_pager.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/dynamic_pager.te#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/dynamic_pager.fc#2 (text+ko) ==== @@ -4,3 +4,4 @@ # MCS categories: /sbin/dynamic_pager -- gen_context(system_u:object_r:dynamic_pager_exec_t,s0) +/private/var/vm/swapfile.* gen_context(system_u:object_r:dynamic_pager_swapfile_t,s0) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/dynamic_pager.te#3 (text+ko) ==== @@ -10,6 +10,9 @@ domain_type(dynamic_pager_t) init_domain(dynamic_pager_t, dynamic_pager_exec_t) +# /var/vm/swapfile* +type dynamic_pager_swapfile_t; + ######################################## # # dynamic_pager local policy @@ -25,5 +28,26 @@ allow dynamic_pager_t self:fifo_file { read write }; allow dynamic_pager_t self:unix_stream_socket create_stream_socket_perms; +# swapfiles +allow dynamic_pager_t var_vm_t:dir { search add_name }; +allow dynamic_pager_t dynamic_pager_swapfile_t:file { create unlink read write swapon setattr }; +allow dynamic_pager_t fs_t:filesystem getattr; +allow dynamic_pager_swapfile_t fs_t:filesystem associate; + +# files created by dynamic_pager in /var/vm are relabeled +type_transition dynamic_pager_t var_vm_t:file dynamic_pager_swapfile_t; + +# talk to console +allow dynamic_pager_t console_device_t:chr_file { read write }; + # Talk to launchd init_allow_ipc(dynamic_pager_t) + +# Talk to self +mach_allow_message(dynamic_pager_t, dynamic_pager_t) + +# Talk to kernel +kernel_allow_ipc(dynamic_pager_t) + +# Read /private +darwin_allow_private_read(dynamic_pager_t) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 19:52:50 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E753C16A52D; Mon, 22 Jan 2007 19:52:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D433A16A4D7 for ; Mon, 22 Jan 2007 19:52:48 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9B82613C45A for ; Mon, 22 Jan 2007 19:52:48 +0000 (UTC) (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 l0MJqmVl083863 for ; Mon, 22 Jan 2007 19:52:48 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MJqmQO083858 for perforce@freebsd.org; Mon, 22 Jan 2007 19:52:48 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 19:52:48 GMT Message-Id: <200701221952.l0MJqmQO083858@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 113384 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 19:52:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=113384 Change 113384 by millert@millert_macbook on 2007/01/22 19:52:24 Allow access to /var/vm and permission to remove old swapfiles. Remove redundant set_special_port rule. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.te#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.te#8 (text+ko) ==== @@ -646,7 +646,6 @@ # Talk to self init_allow_ipc(init_t) allow init_t self:mach_port move_recv; -allow init_t self:mach_task set_special_port; allow init_t self:mi_notify_ipc notify_server_set_state; # Talk to the kernel @@ -677,3 +676,8 @@ # Allow access to security files darwin_allow_security_read(init_t) + +# Allow access to /var/vm +allow init_t var_vm_t:dir { search getattr read remove_name }; +# Allow startup to remove old files +allow init_t dynamic_pager_swapfile_t:file { getattr unlink }; From owner-p4-projects@FreeBSD.ORG Mon Jan 22 19:53:51 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AB7F16A409; Mon, 22 Jan 2007 19:53:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2A2F216A405 for ; Mon, 22 Jan 2007 19:53:51 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E4A5613C45A for ; Mon, 22 Jan 2007 19:53:50 +0000 (UTC) (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 l0MJro4t084194 for ; Mon, 22 Jan 2007 19:53:50 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MJroML084185 for perforce@freebsd.org; Mon, 22 Jan 2007 19:53:50 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 19:53:50 GMT Message-Id: <200701221953.l0MJroML084185@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 113385 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 19:53:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=113385 Change 113385 by millert@millert_macbook on 2007/01/22 19:53:13 Allow make_send. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/kernel.te#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/kernel.te#4 (text+ko) ==== @@ -176,6 +176,8 @@ allow kernel_t self:sock_file r_file_perms; allow kernel_t self:fd use; +allow kernel_t self:mach_port make_send; + allow kernel_t proc_t:dir r_dir_perms; allow kernel_t proc_t:{ lnk_file file } r_file_perms; From owner-p4-projects@FreeBSD.ORG Mon Jan 22 19:53:52 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B0BD716A502; Mon, 22 Jan 2007 19:53:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9358E16A4C4 for ; Mon, 22 Jan 2007 19:53:51 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 66B3E13C45D for ; Mon, 22 Jan 2007 19:53:51 +0000 (UTC) (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 l0MJrpxL084205 for ; Mon, 22 Jan 2007 19:53:51 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MJrosM084199 for perforce@freebsd.org; Mon, 22 Jan 2007 19:53:50 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 19:53:50 GMT Message-Id: <200701221953.l0MJrosM084199@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 113386 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 19:53:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=113386 Change 113386 by millert@millert_macbook on 2007/01/22 19:53:43 Add permissions for /var/vm. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#11 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/diskarbitrationd.te#10 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#8 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#7 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/files.if#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#11 (text+ko) ==== @@ -165,6 +165,8 @@ # Not sure why it wants to search this dir, it should know what it wants allow configd_t var_log_t:dir search; +# Search /var/vm +files_search_vm(securityd_t) # Read /private darwin_allow_private_read(configd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/diskarbitrationd.te#10 (text+ko) ==== @@ -129,4 +129,5 @@ # Read fstools files fstools_read_files(diskarbitrationd_t) - +# Search /var/vm +files_search_vm(diskarbitrationd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#8 (text+ko) ==== @@ -141,6 +141,8 @@ files_search_var(loginwindow_t) files_read_var_symlinks(loginwindow_t) +# Search /var/vm +files_search_vm(loginwindow_t) + # Write to WTMP auth_write_login_records(loginwindow_t) - ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#7 (text+ko) ==== @@ -48,6 +48,8 @@ files_manage_var_dirs(securityd_t) files_manage_var_symlinks(securityd_t) +# Search /var/vm +files_search_vm(securityd_t) # Talk to launchd init_allow_ipc(securityd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/files.if#5 (text+ko) ==== @@ -4501,6 +4501,25 @@ ######################################## ## +## Search the contents of vm irectories (/var/vm). +## +## +## +## Domain allowed access. +## +## +# +interface(`files_search_vm',` + gen_require(` + type var_t, var_vm_t; + ') + + allow $1 var_t:dir search_dir_perms; + allow $1 var_vm_t:dir search_dir_perms; +') + +######################################## +## ## Unconfined access to files. ## ## From owner-p4-projects@FreeBSD.ORG Mon Jan 22 19:54:53 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C78E616A407; Mon, 22 Jan 2007 19:54:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8971216A405 for ; Mon, 22 Jan 2007 19:54:53 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7980C13C47E for ; Mon, 22 Jan 2007 19:54:53 +0000 (UTC) (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 l0MJsr76084410 for ; Mon, 22 Jan 2007 19:54:53 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MJsrrJ084407 for perforce@freebsd.org; Mon, 22 Jan 2007 19:54:53 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 19:54:53 GMT Message-Id: <200701221954.l0MJsrrJ084407@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 113387 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 19:54:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=113387 Change 113387 by millert@millert_macbook on 2007/01/22 19:54:16 Fix type for /System/Library/Caches Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.fc#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.fc#5 (text+ko) ==== @@ -11,7 +11,7 @@ # /System # /System/Library/LoginPlugins.* gen_context(system_u:object_r:darwin_loginplugin_t,s0) -/System/library/Caches.* gen_context(system_u:object_r:darwin_loginplugin_t,s0) +/System/library/Caches.* gen_context(system_u:object_r:darwin_cache_t,s0) /System/library/Services.* gen_context(system_u:object_r:darwin_services_t,s0) /System/Library/Security.* gen_context(system_u:object_r:darwin_security_t,s0) /System/Library/CoreServices.* gen_context(system_u:object_r:darwin_CoreServices_t,s0) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 19:55:55 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C1DB16A417; Mon, 22 Jan 2007 19:55:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5731516A415 for ; Mon, 22 Jan 2007 19:55:55 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 47DD713C4C8 for ; Mon, 22 Jan 2007 19:55:55 +0000 (UTC) (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 l0MJttg6084656 for ; Mon, 22 Jan 2007 19:55:55 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MJttp7084653 for perforce@freebsd.org; Mon, 22 Jan 2007 19:55:55 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 19:55:55 GMT Message-Id: <200701221955.l0MJttp7084653@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 113388 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 19:55:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=113388 Change 113388 by millert@millert_macbook on 2007/01/22 19:55:05 Talk with kextd a bit more Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.te#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.te#4 (text+ko) ==== @@ -68,6 +68,10 @@ # An interface should be defined for this. allow coreservicesd_t loginwindow_t:process taskforpid; +# Talk to kextd +allow coreservicesd_t kextd_t:process taskforpid; +allow coreservicesd_t kextd_t:mach_port { hold_send_once hold_send send recv }; + # Read user home dirs userdom_search_all_users_home_content(coreservicesd_t) userdom_read_all_users_home_content_files(coreservicesd_t) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 19:55:57 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FFB016A478; Mon, 22 Jan 2007 19:55:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D1C1616A588 for ; Mon, 22 Jan 2007 19:55:55 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9B43813C4CB for ; Mon, 22 Jan 2007 19:55:55 +0000 (UTC) (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 l0MJttlZ084663 for ; Mon, 22 Jan 2007 19:55:55 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MJtt9N084659 for perforce@freebsd.org; Mon, 22 Jan 2007 19:55:55 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 19:55:55 GMT Message-Id: <200701221955.l0MJtt9N084659@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 113389 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 19:55:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=113389 Change 113389 by millert@millert_macbook on 2007/01/22 19:55:26 Allow a number of things Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/kextd.te#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/kextd.te#7 (text+ko) ==== @@ -24,23 +24,30 @@ ## internal communication is often done using fifo and unix sockets. allow kextd_t self:fifo_file { read write }; allow kextd_t self:unix_stream_socket create_stream_socket_perms; +allow kextd_t self:socket connect; # Misc allow kextd_t self:fd use; allow kextd_t fs_t:filesystem getattr; +allow kextd_t fs_t:lnk_file read; +allow kextd_t root_t:file read; +allow kextd_t boot_t:file { getattr read }; allow kextd_t self:mach_port { copy_send make_send_once send }; allow kextd_t random_device_t:chr_file read; allow kextd_t nfs_t:filesystem getattr; allow kextd_t nfs_t:lnk_file read; allow kextd_t mnt_t:dir { getattr read search }; +allow kextd_t bin_t:dir { search }; +allow kextd_t bin_t:file { execute_no_trans read getattr }; allow kextd_t sbin_t:dir { getattr read search }; -allow kextd_t sbin_t:file { getattr read }; +allow kextd_t sbin_t:file { getattr read execute_no_trans }; +allow kextd_t lib_t:dir { write add_name }; - # Talk to self mach_allow_message(kextd_t, kextd_t) -allow kextd_t self:process signal; +allow kextd_t self:process { signal setsched }; allow kextd_t self:udp_socket create; +allow kextd_t self:unix_dgram_socket create; # Talk to launchd init_allow_ipc(kextd_t) @@ -49,6 +56,7 @@ # Talk to kernel kernel_allow_ipc(kextd_t) +allow kextd_t kernel_t:process taskforpid; # Talk to diskarbitrationd diskarbitrationd_allow_ipc(kextd_t) @@ -77,7 +85,8 @@ # Use tmp files files_tmp_file(kextd_t) files_manage_generic_tmp_files(kextd_t) -files_manage_generic_tmp_files(kextd_t) +files_read_generic_tmp_symlinks(kextd_t) +allow kextd_t tmp_t:dir { create rmdir }; # Read /private/var files_read_var_files(kextd_t) @@ -91,6 +100,11 @@ # Use CoreServices darwin_allow_CoreServices_read(kextd_t) +allow kextd_t coreservicesd_t:shm { read write }; +allow kextd_t coreservicesd_t:mach_port hold_send; # Read modules modutils_read_module_deps(kextd_t) + +# Talk to console +allow kextd_t console_device_t:chr_file { read write }; From owner-p4-projects@FreeBSD.ORG Mon Jan 22 19:55:58 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35EC316A5FF; Mon, 22 Jan 2007 19:55:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D278D16A589 for ; Mon, 22 Jan 2007 19:55:56 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EE4F613C4CC for ; Mon, 22 Jan 2007 19:55:55 +0000 (UTC) (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 l0MJtt6Z084669 for ; Mon, 22 Jan 2007 19:55:55 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MJttMh084666 for perforce@freebsd.org; Mon, 22 Jan 2007 19:55:55 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 19:55:55 GMT Message-Id: <200701221955.l0MJttMh084666@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 113390 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 19:55:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=113390 Change 113390 by millert@millert_macbook on 2007/01/22 19:55:44 Correct case. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.fc#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.fc#6 (text+ko) ==== @@ -11,8 +11,8 @@ # /System # /System/Library/LoginPlugins.* gen_context(system_u:object_r:darwin_loginplugin_t,s0) -/System/library/Caches.* gen_context(system_u:object_r:darwin_cache_t,s0) -/System/library/Services.* gen_context(system_u:object_r:darwin_services_t,s0) +/System/Library/Caches.* gen_context(system_u:object_r:darwin_cache_t,s0) +/System/Library/Services.* gen_context(system_u:object_r:darwin_services_t,s0) /System/Library/Security.* gen_context(system_u:object_r:darwin_security_t,s0) /System/Library/CoreServices.* gen_context(system_u:object_r:darwin_CoreServices_t,s0) /System/Library/ColorSync.* gen_context(system_u:object_r:darwin_resource_t,s0) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 19:56:58 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E867116A413; Mon, 22 Jan 2007 19:56:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C70C816A403 for ; Mon, 22 Jan 2007 19:56:57 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B6FA613C457 for ; Mon, 22 Jan 2007 19:56:57 +0000 (UTC) (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 l0MJuvpJ084737 for ; Mon, 22 Jan 2007 19:56:57 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MJuvw9084734 for perforce@freebsd.org; Mon, 22 Jan 2007 19:56:57 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 19:56:57 GMT Message-Id: <200701221956.l0MJuvw9084734@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 113391 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 19:56:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=113391 Change 113391 by millert@millert_macbook on 2007/01/22 19:56:03 Add move_send_once. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.te#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.te#5 (text+ko) ==== @@ -70,7 +70,7 @@ # Talk to kextd allow coreservicesd_t kextd_t:process taskforpid; -allow coreservicesd_t kextd_t:mach_port { hold_send_once hold_send send recv }; +allow coreservicesd_t kextd_t:mach_port { hold_send_once hold_send move_send_once send recv }; # Read user home dirs userdom_search_all_users_home_content(coreservicesd_t) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 19:56:58 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7773D16A6A2; Mon, 22 Jan 2007 19:56:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3D1CC16A6A0 for ; Mon, 22 Jan 2007 19:56:58 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 21D9813C468 for ; Mon, 22 Jan 2007 19:56:58 +0000 (UTC) (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 l0MJuwc4084744 for ; Mon, 22 Jan 2007 19:56:58 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MJuvT9084740 for perforce@freebsd.org; Mon, 22 Jan 2007 19:56:57 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 19:56:57 GMT Message-Id: <200701221956.l0MJuvT9084740@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 113392 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 19:56:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=113392 Change 113392 by millert@millert_macbook on 2007/01/22 19:56:29 Permit darwin_cache_t dir/file access. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.te#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/kextd.te#8 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#9 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#8 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.te#9 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.te#6 (text+ko) ==== @@ -80,6 +80,5 @@ files_read_var_files(coreservicesd_t) files_read_var_symlinks(coreservicesd_t) - - - +# Access cache files +allow coreservicesd_t darwin_cache_t:dir { getattr search }; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/kextd.te#8 (text+ko) ==== @@ -108,3 +108,6 @@ # Talk to console allow kextd_t console_device_t:chr_file { read write }; + +# Access cache files +allow kextd_t darwin_cache_t:dir { search getattr add_name }; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#9 (text+ko) ==== @@ -146,3 +146,6 @@ # Write to WTMP auth_write_login_records(loginwindow_t) + +# Access cache files +allow loginwindow_t darwin_cache_t:dir search; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#8 (text+ko) ==== @@ -111,3 +111,7 @@ # Allow reading of security_t files darwin_allow_security_read(securityd_t) + +# Access cache files +allow securityd_t darwin_cache_t:dir search; +allow securityd_t darwin_cache_t:file { read lock }; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.te#9 (text+ko) ==== @@ -681,3 +681,7 @@ allow init_t var_vm_t:dir { search getattr read remove_name }; # Allow startup to remove old files allow init_t dynamic_pager_swapfile_t:file { getattr unlink }; + +# Allow access to Cache files +allow init_t darwin_cache_t:dir search; +allow init_t darwin_cache_t:file { read write lock }; From owner-p4-projects@FreeBSD.ORG Mon Jan 22 19:56:59 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6162F16A712; Mon, 22 Jan 2007 19:56:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1E17716A70A for ; Mon, 22 Jan 2007 19:56:58 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9836013C469 for ; Mon, 22 Jan 2007 19:56:58 +0000 (UTC) (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 l0MJuwo7084751 for ; Mon, 22 Jan 2007 19:56:58 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MJuwbD084747 for perforce@freebsd.org; Mon, 22 Jan 2007 19:56:58 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 19:56:58 GMT Message-Id: <200701221956.l0MJuwbD084747@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 113393 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 19:56:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=113393 Change 113393 by millert@millert_macbook on 2007/01/22 19:56:50 Interact with coreservicesd. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.te#10 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#12 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#10 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/lookupd.te#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/notifyd.te#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#9 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.te#10 (text+ko) ==== @@ -112,6 +112,7 @@ # Talk to CoreServices darwin_allow_CoreServices_read(WindowServer_t) +allow WindowServer_t coreservicesd_t:shm { read write }; # Read /private darwin_allow_private_read(WindowServer_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#12 (text+ko) ==== @@ -155,6 +155,7 @@ # Read CoreServices libs, etc darwin_allow_CoreServices_read(configd_t) +allow configd_t coreservicesd_t:shm { read write }; # Read/write /private/var files_rw_var_files(configd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#10 (text+ko) ==== @@ -79,6 +79,7 @@ # Use CoreServices darwin_allow_CoreServices_read(loginwindow_t) darwin_allow_CoreServices_execute(loginwindow_t) +allow loginwindow_t coreservicesd_t:shm { read write }; # Read prefs darwin_allow_global_pref_rw(loginwindow_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/lookupd.te#6 (text+ko) ==== @@ -89,6 +89,7 @@ # Use CoreServices darwin_allow_CoreServices_read(lookupd_t) +allow lookupd_t coreservicesd_t:mach_port { hold_send_once send move_send_once }; # Read /private darwin_allow_private_read(lookupd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/notifyd.te#5 (text+ko) ==== @@ -38,6 +38,9 @@ # Talk to launchd init_allow_ipc(notifyd_t) +# Talk to CoreServices +allow notifyd_t coreservicesd_t:mach_port { hold_send_once send move_send_once }; + # Allow signalling of other processes allow notifyd_t init_t:process signal; allow notifyd_t lookupd_t:process signal; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#9 (text+ko) ==== @@ -72,6 +72,7 @@ # Use CoreServices darwin_allow_CoreServices_read(securityd_t) darwin_allow_CoreServices_execute(securityd_t) +allow securityd_t coreservicesd_t:shm { read write }; # Read prefs darwin_allow_global_pref_read(securityd_t) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 19:58:00 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C90A16A475; Mon, 22 Jan 2007 19:58:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7B09516A473 for ; Mon, 22 Jan 2007 19:58:00 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6A7C913C442 for ; Mon, 22 Jan 2007 19:58:00 +0000 (UTC) (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 l0MJw0dA085057 for ; Mon, 22 Jan 2007 19:58:00 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MJw0Zu085053 for perforce@freebsd.org; Mon, 22 Jan 2007 19:58:00 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 19:58:00 GMT Message-Id: <200701221958.l0MJw0Zu085053@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 113394 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 19:58:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=113394 Change 113394 by millert@millert_macbook on 2007/01/22 19:57:15 More work on coreservicesd. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.te#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.te#7 (text+ko) ==== @@ -27,9 +27,10 @@ # Talk to self mach_allow_message(coreservicesd_t, coreservicesd_t) -allow coreservicesd_t self:process signal; +allow coreservicesd_t self:process { signal taskforpid }; allow coreservicesd_t self:shm { create read setattr write }; allow coreservicesd_t self:udp_socket create; +allow coreservicesd_t self:mach_port move_recv; # Talk to launchd init_allow_ipc(coreservicesd_t) @@ -39,9 +40,20 @@ # Talk to WindowServer WindowServer_allow_ipc(coreservicesd_t) +allow coreservicesd_t WindowServer_t:process taskforpid; # Talk to configd configd_allow_ipc(coreservicesd_t) +allow coreservicesd_t configd_t:process taskforpid; + +# Talk to securityd +securityd_allow_ipc(coreservicesd_t) +allow coreservicesd_t securityd_t:process taskforpid; + +# Talk to init process +allow coreservicesd_t init_t:process taskforpid; +allow coreservicesd_t init_t:mi_bootstrap { bootstrap_look_up bootstrap_check_in }; +allow coreservicesd_t init_t:mi_notify_ipc notify_server_register_plain; # Use CoreServices darwin_allow_CoreServices_read(coreservicesd_t) @@ -62,6 +74,7 @@ # Use frameworks frameworks_read(coreservicesd_t) +frameworks_execute(coreservicesd_t) # Talk to loginwindow loginwindow_allow_ipc(coreservicesd_t) @@ -82,3 +95,12 @@ # Access cache files allow coreservicesd_t darwin_cache_t:dir { getattr search }; + +# Search dirs +allow coreservicesd_t { darwin_system_t mnt_t fs_t }:dir { getattr search }; + +# Use /dev/fsevents +allow coreservicesd_t device_t:chr_file { read ioctl }; + +# Stat filesystems +allow coreservicesd_t fs_t:filesystem getattr; From owner-p4-projects@FreeBSD.ORG Mon Jan 22 19:58:01 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25F5516A401; Mon, 22 Jan 2007 19:58:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D9DC116A5AE for ; Mon, 22 Jan 2007 19:58:00 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C8F7913C448 for ; Mon, 22 Jan 2007 19:58:00 +0000 (UTC) (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 l0MJw0xv085064 for ; Mon, 22 Jan 2007 19:58:00 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MJw0d3085060 for perforce@freebsd.org; Mon, 22 Jan 2007 19:58:00 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 19:58:00 GMT Message-Id: <200701221958.l0MJw0d3085060@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 113395 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 19:58:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=113395 Change 113395 by millert@millert_macbook on 2007/01/22 19:57:52 Allow reading from /System Allow reading from Frameworks. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/KernelEventAgent.te#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreaudiod.te#7 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/mDNSResponder.te#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/memberd.te#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/update.te#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/KernelEventAgent.te#5 (text+ko) ==== @@ -40,3 +40,9 @@ # Talk to securityd securityd_allow_ipc(KernelEventAgent_t) + +# Use Frameworks +frameworks_read(KernelEventAgent_t) + +# read /System +darwin_allow_system_read(KernelEventAgent_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreaudiod.te#7 (text+ko) ==== @@ -67,3 +67,6 @@ # Allow reading of /var files_read_var_symlinks(coreaudiod_t) files_read_var_files(coreaudiod_t) + +# read /System +darwin_allow_system_read(coreaudiod_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/mDNSResponder.te#5 (text+ko) ==== @@ -79,3 +79,6 @@ # Talk to notifyd notifyd_allow_ipc(mDNSResponder_t) + +# read /System +darwin_allow_system_read(mDNSResponder_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/memberd.te#4 (text+ko) ==== @@ -55,4 +55,5 @@ # Talk to WindowServer WindowServer_allow_ipc(memberd_t) - +# read /System +darwin_allow_system_read(memberd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/update.te#4 (text+ko) ==== @@ -34,3 +34,5 @@ # talk to launchd init_allow_ipc(update_t) +# read /System +darwin_allow_system_read(update_t) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 19:59:03 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF37016A669; Mon, 22 Jan 2007 19:59:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A9FE816A666 for ; Mon, 22 Jan 2007 19:59:02 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9AE1513C469 for ; Mon, 22 Jan 2007 19:59:02 +0000 (UTC) (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 l0MJx24o085353 for ; Mon, 22 Jan 2007 19:59:02 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MJx2rf085347 for perforce@freebsd.org; Mon, 22 Jan 2007 19:59:02 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 19:59:02 GMT Message-Id: <200701221959.l0MJx2rf085347@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 113396 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 19:59:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=113396 Change 113396 by millert@millert_macbook on 2007/01/22 19:58:11 Use Frameworks. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreaudiod.te#8 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/mDNSResponder.te#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/memberd.te#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/update.te#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreaudiod.te#8 (text+ko) ==== @@ -54,6 +54,9 @@ # Talk to lookupd lookupd_allow_ipc(coreaudiod_t) +# Use Frameworks +frameworks_read(coreaudiod_t) + # Allow reading of prefs darwin_allow_global_pref_read(coreaudiod_t) darwin_allow_host_pref_read(coreaudiod_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/mDNSResponder.te#6 (text+ko) ==== @@ -70,6 +70,9 @@ # Use CoreServices darwin_allow_CoreServices_read(mDNSResponder_t) +# Use Frameworks +frameworks_read(mDNSResponder_t) + # Read prefs darwin_allow_global_pref_read(mDNSResponder_t) darwin_allow_host_pref_read(mDNSResponder_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/memberd.te#5 (text+ko) ==== @@ -55,5 +55,8 @@ # Talk to WindowServer WindowServer_allow_ipc(memberd_t) +# Use Frameworks +frameworks_read(memberd_t) + # read /System darwin_allow_system_read(memberd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/update.te#5 (text+ko) ==== @@ -34,5 +34,8 @@ # talk to launchd init_allow_ipc(update_t) +# Use Frameworks +frameworks_read(update_t) + # read /System darwin_allow_system_read(update_t) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 19:59:03 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 372FA16A6E7; Mon, 22 Jan 2007 19:59:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1029716A6B3 for ; Mon, 22 Jan 2007 19:59:03 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id F3E9413C474 for ; Mon, 22 Jan 2007 19:59:02 +0000 (UTC) (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 l0MJx225085366 for ; Mon, 22 Jan 2007 19:59:02 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MJx2F4085356 for perforce@freebsd.org; Mon, 22 Jan 2007 19:59:02 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 19:59:02 GMT Message-Id: <200701221959.l0MJx2F4085356@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 113397 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 19:59:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=113397 Change 113397 by millert@millert_macbook on 2007/01/22 19:58:33 Clean up notifyd. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/mDNSResponder.te#7 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/memberd.te#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/notifyd.te#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/mDNSResponder.te#7 (text+ko) ==== @@ -73,6 +73,9 @@ # Use Frameworks frameworks_read(mDNSResponder_t) +# Allow shared memory usage w/ notifyd +notifyd_allow_shm(mDNSResponder_t) + # Read prefs darwin_allow_global_pref_read(mDNSResponder_t) darwin_allow_host_pref_read(mDNSResponder_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/memberd.te#6 (text+ko) ==== @@ -55,6 +55,9 @@ # Talk to WindowServer WindowServer_allow_ipc(memberd_t) +# Allow shared memory usage w/ notifyd +notifyd_allow_shm(memberd_t) + # Use Frameworks frameworks_read(memberd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/notifyd.te#6 (text+ko) ==== @@ -24,7 +24,11 @@ ## internal communication is often done using fifo and unix sockets. allow notifyd_t self:fifo_file { read write }; allow notifyd_t self:unix_stream_socket create_stream_socket_perms; +allow notifyd_t self:socket connect; +allow notifyd_t self:shm { create setattr write read }; +# Perform filesystem operations +fs_getattr_xattr_fs(notifyd_t) # Misc allow notifyd_t mnt_t:dir { getattr search }; allow notifyd_t nfs_t:lnk_file { getattr read }; @@ -32,12 +36,18 @@ # Talk to self mach_allow_message(notifyd_t, notifyd_t) +# Allow bootstrap lookups +init_allow_bootstrap(notifyd_t) + # Talk to kernel kernel_allow_ipc(notifyd_t) # Talk to launchd init_allow_ipc(notifyd_t) +# Allow communication with memberd +memberd_allow_ipc(notifyd_t) + # Talk to CoreServices allow notifyd_t coreservicesd_t:mach_port { hold_send_once send move_send_once }; @@ -47,3 +57,6 @@ # Read /private darwin_allow_private_read(notifyd_t) + +# /var operations +files_read_var_symlinks(notifyd_t) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 19:59:03 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BAA416A7E2; Mon, 22 Jan 2007 19:59:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 64E6116A7B9 for ; Mon, 22 Jan 2007 19:59:03 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 533B613C457 for ; Mon, 22 Jan 2007 19:59:03 +0000 (UTC) (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 l0MJx3cn085376 for ; Mon, 22 Jan 2007 19:59:03 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MJx3B7085369 for perforce@freebsd.org; Mon, 22 Jan 2007 19:59:03 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 19:59:03 GMT Message-Id: <200701221959.l0MJx3B7085369@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 113398 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 19:59:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=113398 Change 113398 by millert@millert_macbook on 2007/01/22 19:58:59 Clean up memberd. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/memberd.te#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/memberd.te#7 (text+ko) ==== @@ -28,6 +28,8 @@ ## internal communication is often done using fifo and unix sockets. allow memberd_t self:fifo_file { read write }; allow memberd_t self:unix_stream_socket create_stream_socket_perms; +allow memberd_t self:socket { connect write }; +allow memberd_t self:unix_dgram_socket create; # pid file allow memberd_t memberd_var_run_t:file manage_file_perms; @@ -55,11 +57,21 @@ # Talk to WindowServer WindowServer_allow_ipc(memberd_t) -# Allow shared memory usage w/ notifyd +# Talk to notifyd +notifyd_allow_ipc(memberd_t) notifyd_allow_shm(memberd_t) # Use Frameworks frameworks_read(memberd_t) +# Read CoreServices +darwin_allow_CoreServices_read(memberd_t) + # read /System darwin_allow_system_read(memberd_t) + +# Read /private +darwin_allow_private_read(memberd_t) + +# Read /var symlinks +files_read_var_files(memberd_t) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:00:06 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F306316A419; Mon, 22 Jan 2007 20:00:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BEA7B16A416 for ; Mon, 22 Jan 2007 20:00:05 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8EFBD13C4A7 for ; Mon, 22 Jan 2007 20:00:05 +0000 (UTC) (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 l0MK05om086517 for ; Mon, 22 Jan 2007 20:00:05 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MK052I086505 for perforce@freebsd.org; Mon, 22 Jan 2007 20:00:05 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:00:05 GMT Message-Id: <200701222000.l0MK052I086505@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 113399 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:00:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=113399 Change 113399 by millert@millert_macbook on 2007/01/22 19:59:41 Update mDNSResponder. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/mDNSResponder.te#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/mDNSResponder.te#8 (text+ko) ==== @@ -42,7 +42,7 @@ # Talk to self allow mDNSResponder_t self:fd use; -allow mDNSResponder_t self:socket { accept bind create read write }; +allow mDNSResponder_t self:socket { accept bind create connect listen read write }; allow mDNSResponder_t self:udp_socket create; allow mDNSResponder_t self:tcp_socket create; allow mDNSResponder_t self:unix_dgram_socket create; @@ -88,3 +88,9 @@ # read /System darwin_allow_system_read(mDNSResponder_t) + +# Read /var symlinks +files_read_var_files(mDNSResponder_t) + +# Read /sbin +allow mDNSResponder_t sbin_t:dir { getattr read search }; From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:01:07 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B45B316A53D; Mon, 22 Jan 2007 20:01:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7255D16A4F8 for ; Mon, 22 Jan 2007 20:01:07 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6327013C441 for ; Mon, 22 Jan 2007 20:01:07 +0000 (UTC) (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 l0MK17Lr086767 for ; Mon, 22 Jan 2007 20:01:07 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MK17Je086763 for perforce@freebsd.org; Mon, 22 Jan 2007 20:01:07 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:01:07 GMT Message-Id: <200701222001.l0MK17Je086763@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 113400 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:01:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=113400 Change 113400 by millert@millert_macbook on 2007/01/22 20:00:24 Enable communication. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreaudiod.te#9 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#10 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreaudiod.te#9 (text+ko) ==== @@ -47,6 +47,7 @@ # Talk to securityd securityd_allow_ipc(securityd_t) +mach_allow_message(coreaudiod_t, securityd_t) # Talk to kernel kernel_allow_ipc(coreaudiod_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#10 (text+ko) ==== @@ -69,6 +69,9 @@ # Talk to kernel kernel_allow_ipc(securityd_t) +# Talk to coreaudiod +mach_allow_message(securityd_t, coreaudiod_t) + # Use CoreServices darwin_allow_CoreServices_read(securityd_t) darwin_allow_CoreServices_execute(securityd_t) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:02:10 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AF6316A479; Mon, 22 Jan 2007 20:02:10 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0B1B716A477 for ; Mon, 22 Jan 2007 20:02:10 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EF1C413C4DA for ; Mon, 22 Jan 2007 20:02:09 +0000 (UTC) (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 l0MK29QO087447 for ; Mon, 22 Jan 2007 20:02:09 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MK29w6087444 for perforce@freebsd.org; Mon, 22 Jan 2007 20:02:09 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:02:09 GMT Message-Id: <200701222002.l0MK29w6087444@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 113402 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:02:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=113402 Change 113402 by millert@millert_macbook on 2007/01/22 20:02:00 Update. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#13 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#11 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#12 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/update.te#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ntp.te#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.te#10 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#13 (text+ko) ==== @@ -67,6 +67,7 @@ allow configd_t self:rawip_socket create; allow configd_t self:socket { bind create listen read write }; allow configd_t random_device_t:chr_file read; +allow configd_t fs_t:filesystem { associate getattr }; allow configd_t nfs_t:dir { add_name getattr read search }; allow configd_t nfs_t:filesystem { getattr mount }; allow configd_t nfs_t:lnk_file { create getattr read }; @@ -187,6 +188,7 @@ # Read/write/manage keychain files darwin_allow_keychain_rw(configd_t) darwin_allow_keychain_manage(configd_t) +allow configd_t darwin_keychain_t:dir { add_name remove_name }; # Read files in /tmp files_getattr_tmp_dirs(configd_t) @@ -203,3 +205,5 @@ userdom_read_all_users_home_content_files(configd_t) userdom_manage_all_users_home_content_files(configd_t) +# Search /var/vm +files_search_vm(configd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#11 (text+ko) ==== @@ -28,7 +28,8 @@ allow loginwindow_t self:unix_stream_socket create_stream_socket_perms; # Misc -allow loginwindow_t console_device_t:chr_file { read setattr write }; +term_use_console(loginwindow_t) +term_setattr_console(loginwindow_t) allow loginwindow_t lib_t:file execute_no_trans; allow loginwindow_t self:fd use; allow loginwindow_t self:process { taskforpid signal }; # XXX ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#12 (text+ko) ==== @@ -37,7 +37,7 @@ # Misc allow securityd_t mnt_t:dir { getattr search }; allow securityd_t nfs_t:dir { getattr search }; -allow securityd_t nfs_t:filesystem getattr; +allow securityd_t { fs_t nfs_t }:filesystem getattr; allow securityd_t nfs_t:lnk_file read; allow securityd_t usr_t:file { getattr read }; allow securityd_t random_device_t:chr_file { read write }; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/update.te#6 (text+ko) ==== @@ -25,6 +25,8 @@ allow update_t self:fifo_file { read write }; allow update_t self:unix_stream_socket create_stream_socket_perms; +term_use_console(update_t) + # talk to self mach_allow_message(update_t, update_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ntp.te#4 (text+ko) ==== @@ -101,6 +101,7 @@ files_read_etc_runtime_files(ntpd_t) files_read_usr_files(ntpd_t) files_list_var_lib(ntpd_t) +files_read_var_files(ntpd_t) init_exec_script_files(ntpd_t) init_use_fds(ntpd_t) @@ -137,6 +138,8 @@ allow ntpd_t mnt_t:dir search; allow ntpd_t nfs_t:lnk_file read; +# Read /private +darwin_allow_private_read(ntpd_t) ifdef(`targeted_policy', ` term_dontaudit_use_unallocated_ttys(ntpd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.te#10 (text+ko) ==== @@ -670,6 +670,7 @@ # Allow access to /private darwin_allow_private_manage(init_t) darwin_allow_private_rw(init_t) +allow init_t darwin_private_t:dir relabelfrom; # Allow keychain access darwin_allow_keychain_read(init_t) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:02:15 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D262A16A484; Mon, 22 Jan 2007 20:02:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 985B816A47E for ; Mon, 22 Jan 2007 20:02:14 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7D3F513C469 for ; Mon, 22 Jan 2007 20:02:14 +0000 (UTC) (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 l0MK2902087441 for ; Mon, 22 Jan 2007 20:02:09 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MK298W087436 for perforce@freebsd.org; Mon, 22 Jan 2007 20:02:09 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:02:09 GMT Message-Id: <200701222002.l0MK298W087436@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 113401 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:02:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=113401 Change 113401 by millert@millert_macbook on 2007/01/22 20:01:14 Update. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/diskarbitrationd.te#11 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/lookupd.te#7 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#11 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/logging.te#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/diskarbitrationd.te#11 (text+ko) ==== @@ -47,22 +47,20 @@ allow diskarbitrationd_t self:socket { connect write }; allow diskarbitrationd_t self:udp_socket create; allow diskarbitrationd_t self:unix_dgram_socket create; -allow diskarbitrationd_t sbin_t:dir search; +allow diskarbitrationd_t sbin_t:dir { getattr read search }; # Allow disk/device/fs operations allow diskarbitrationd_t device_t:chr_file { ioctl read }; -allow diskarbitrationd_t fs_t:dir getattr; +allow diskarbitrationd_t fs_t:dir { search getattr }; +allow diskarbitrationd_t fs_t:lnk_file unlink; allow diskarbitrationd_t fsadm_t:file execute_no_trans; # Allow mount operations -allow diskarbitrationd_t fs_t:filesystem mount; +allow diskarbitrationd_t fs_t:filesystem { getattr mount }; allow diskarbitrationd_t mnt_t:dir { getattr read remove_name rmdir search }; allow diskarbitrationd_t mnt_t:file { getattr unlink }; allow diskarbitrationd_t mnt_t:lnk_file unlink; - - - # Allow various file operations allow diskarbitrationd_t nfs_t:dir getattr; allow diskarbitrationd_t nfs_t:filesystem mount; @@ -76,12 +74,7 @@ # Allow access to raw disk devices storage_raw_read_fixed_disk(diskarbitrationd_t) -# Note: This causes the following error...we need to figure it out: -# -## libsepol.check_assertion_helper: assertion on line 337564 violated by allow diskarbitrationd_t fixed_disk_device_t:blk_file { read }; -# libsepol.check_assertions: 1 assertion violations occured -# Error while expanding policy -#allow diskarbitrationd_t fixed_disk_device_t:blk_file { ioctl read }; +storage_raw_write_fixed_disk(diskarbitrationd_t) # Allow signaling fsck, etc allow diskarbitrationd_t fsadm_t:process signal; @@ -117,6 +110,9 @@ darwin_allow_host_pref_read(diskarbitrationd_t) darwin_allow_system_read(diskarbitrationd_t) +# Use CoreServices +darwin_allow_CoreServices_read(diskarbitrationd_t) + # Allow access to frameworks frameworks_read(diskarbitrationd_t) @@ -131,3 +127,6 @@ # Search /var/vm files_search_vm(diskarbitrationd_t) + +# Read /var (symlinks) +files_read_var_files(diskarbitrationd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/lookupd.te#7 (text+ko) ==== @@ -46,7 +46,7 @@ # Misc allow lookupd_t mnt_t:dir search; -allow lookupd_t nfs_t:filesystem getattr; +allow lookupd_t { fs_t nfs_t }:filesystem getattr; allow lookupd_t nfs_t:lnk_file read; allow lookupd_t port_t:tcp_socket name_connect; allow lookupd_t random_device_t:chr_file read; @@ -103,3 +103,7 @@ # Allow Mach IPC w/ syslogd logging_allow_ipc(lookupd_t) + +# Read /var +files_list_var(lookupd_t) +files_read_var_files(lookupd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#11 (text+ko) ==== @@ -40,7 +40,7 @@ allow securityd_t nfs_t:filesystem getattr; allow securityd_t nfs_t:lnk_file read; allow securityd_t usr_t:file { getattr read }; -allow securityd_t random_device_t:chr_file read; +allow securityd_t random_device_t:chr_file { read write }; allow securityd_t sbin_t:dir { getattr read search }; # /var file operations ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/logging.te#6 (text+ko) ==== @@ -53,6 +53,9 @@ allow syslogd_t devlog_t:sock_file create_file_perms; files_pid_filetrans(syslogd_t,devlog_t,sock_file) +# Read /var symlinks +files_read_var_files(syslogd_t) + # create/append log files. allow syslogd_t var_log_t:dir rw_dir_perms; allow syslogd_t var_log_t:file create_file_perms; @@ -86,11 +89,12 @@ # Kernel messages come from /dev/klog dev_filetrans(syslogd_t,devklog_t,chr_file) genfscon devfs /klog gen_context(system_u:object_r:devklog_t,0s) -allow syslogd_t devklog_t:chr_file read; +allow syslogd_t devklog_t:chr_file { read ioctl }; fs_search_auto_mountpoints(syslogd_t) term_write_console(syslogd_t) +allow syslogd_t console_device_t:file write; # Allow syslog to a terminal term_write_unallocated_ttys(syslogd_t) @@ -142,12 +146,16 @@ kernel_allow_ipc(syslogd_t) # Talk to self -allow syslogd_t self:socket read; +allow syslogd_t self:socket { bind listen accept read }; +allow syslogd_t self:mach_port make_send_once; # Talk to notifyd notifyd_allow_ipc(syslogd_t) notifyd_allow_shm(syslogd_t) +# Read /private +darwin_allow_private_read(syslogd_t) + ifdef(`targeted_policy',` allow syslogd_t var_run_t:fifo_file { ioctl read write }; term_dontaudit_use_unallocated_ttys(syslogd_t) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:03:12 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BFC916A405; Mon, 22 Jan 2007 20:03:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E05A616A400 for ; Mon, 22 Jan 2007 20:03:11 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C56C113C44C for ; Mon, 22 Jan 2007 20:03:11 +0000 (UTC) (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 l0MK3Bba088879 for ; Mon, 22 Jan 2007 20:03:11 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MK3B9T088876 for perforce@freebsd.org; Mon, 22 Jan 2007 20:03:11 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:03:11 GMT Message-Id: <200701222003.l0MK3B9T088876@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 113403 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:03:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=113403 Change 113403 by millert@millert_macbook on 2007/01/22 20:02:18 Allow searching volfs_t. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.te#11 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#14 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.te#8 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/kextd.te#9 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#12 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#13 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.te#11 (text+ko) ==== @@ -94,6 +94,7 @@ allow WindowServer_t bin_t:dir search; allow WindowServer_t mnt_t:dir getattr; allow WindowServer_t sbin_t:dir search; +allow WindowServer_t volfs_t:dir search; # Read prefs, etc darwin_allow_global_pref_read(WindowServer_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#14 (text+ko) ==== @@ -72,6 +72,7 @@ allow configd_t nfs_t:filesystem { getattr mount }; allow configd_t nfs_t:lnk_file { create getattr read }; allow configd_t mnt_t:dir { getattr read search }; +allow configd_t volfs_t:dir search; allow configd_t self:socket connect; allow configd_t self:unix_dgram_socket create; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.te#8 (text+ko) ==== @@ -98,6 +98,7 @@ # Search dirs allow coreservicesd_t { darwin_system_t mnt_t fs_t }:dir { getattr search }; +allow coreservicesd_t volfs_t:dir { search }; # Use /dev/fsevents allow coreservicesd_t device_t:chr_file { read ioctl }; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/kextd.te#9 (text+ko) ==== @@ -42,6 +42,7 @@ allow kextd_t sbin_t:dir { getattr read search }; allow kextd_t sbin_t:file { getattr read execute_no_trans }; allow kextd_t lib_t:dir { write add_name }; +allow kextd_t volfs_t:dir search; # Talk to self mach_allow_message(kextd_t, kextd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#12 (text+ko) ==== @@ -43,6 +43,7 @@ allow loginwindow_t nfs_t:filesystem getattr; allow loginwindow_t nfs_t:lnk_file { getattr read }; allow loginwindow_t usr_t:file { getattr read }; +allow loginwindow_t volfs_t:dir search; # There has to be a "proper" interface for this. Fix this when we find it allow loginwindow_t bin_t:dir search; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#13 (text+ko) ==== @@ -37,6 +37,7 @@ # Misc allow securityd_t mnt_t:dir { getattr search }; allow securityd_t nfs_t:dir { getattr search }; +allow securityd_t volfs_t:dir { search }; allow securityd_t { fs_t nfs_t }:filesystem getattr; allow securityd_t nfs_t:lnk_file read; allow securityd_t usr_t:file { getattr read }; From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:03:12 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B1BE16A4EA; Mon, 22 Jan 2007 20:03:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3F11F16A421 for ; Mon, 22 Jan 2007 20:03:12 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2A94A13C467 for ; Mon, 22 Jan 2007 20:03:12 +0000 (UTC) (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 l0MK3Cj3088887 for ; Mon, 22 Jan 2007 20:03:12 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MK3BY2088882 for perforce@freebsd.org; Mon, 22 Jan 2007 20:03:11 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:03:11 GMT Message-Id: <200701222003.l0MK3BY2088882@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 113404 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:03:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=113404 Change 113404 by millert@millert_macbook on 2007/01/22 20:02:38 Label and permit access to /Library/Caches. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#14 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.fc#7 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.te#11 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#14 (text+ko) ==== @@ -117,6 +117,7 @@ # Allow reading of security_t files darwin_allow_security_read(securityd_t) -# Access cache files -allow securityd_t darwin_cache_t:dir search; +# Read/write caches +darwin_allow_cache_rw(securityd_t) +allow securityd_t darwin_cache_t:dir { search getattr }; allow securityd_t darwin_cache_t:file { read lock }; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.fc#7 (text+ko) ==== @@ -14,8 +14,8 @@ /System/Library/Caches.* gen_context(system_u:object_r:darwin_cache_t,s0) /System/Library/Services.* gen_context(system_u:object_r:darwin_services_t,s0) /System/Library/Security.* gen_context(system_u:object_r:darwin_security_t,s0) -/System/Library/CoreServices.* gen_context(system_u:object_r:darwin_CoreServices_t,s0) -/System/Library/ColorSync.* gen_context(system_u:object_r:darwin_resource_t,s0) +/System/Library/CoreServices.* gen_context(system_u:object_r:darwin_CoreServices_t,s0) +/System/Library/ColorSync.* gen_context(system_u:object_r:darwin_resource_t,s0) # # Applications @@ -25,11 +25,12 @@ # # /Library # +/Library/Caches.* gen_context(system_u:object_r:darwin_cache_t,s0) /Library/ColorSync.* gen_context(system_u:object_r:darwin_resource_t,s0) /Library/Preferences/.GlobalPreferences.plist -- gen_context(system_u:object_r:darwin_global_pref_t,s0) /Library/Preferences.* gen_context(system_u:object_r:darwin_global_pref_t,s0) /Library/Preferences/SystemConfiguration.* gen_context(system_u:object_r:darwin_global_pref_t,s0) -/Library/Keychains.* gen_context(system_u:object_r:darwin_keychain_t,s0) +/Library/Keychains.* gen_context(system_u:object_r:darwin_keychain_t,s0) # Kernel /mach_kernel -- gen_context(system_u:object_r:boot_t,s0) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.te#11 (text+ko) ==== @@ -684,5 +684,6 @@ allow init_t dynamic_pager_swapfile_t:file { getattr unlink }; # Allow access to Cache files -allow init_t darwin_cache_t:dir search; -allow init_t darwin_cache_t:file { read write lock }; +darwin_allow_cache_rw(init_t) +allow init_t darwin_cache_t:dir { getattr search add_name remove_name }; +allow init_t darwin_cache_t:file { create setattr unlink }; From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:04:15 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D06A016A408; Mon, 22 Jan 2007 20:04:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9B20D16A405 for ; Mon, 22 Jan 2007 20:04:14 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 73DC713C45B for ; Mon, 22 Jan 2007 20:04:14 +0000 (UTC) (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 l0MK4EWv089137 for ; Mon, 22 Jan 2007 20:04:14 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MK4E1X089134 for perforce@freebsd.org; Mon, 22 Jan 2007 20:04:14 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:04:14 GMT Message-Id: <200701222004.l0MK4E1X089134@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 113405 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:04:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=113405 Change 113405 by millert@millert_macbook on 2007/01/22 20:03:14 Allow getattr on tmp_t. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/diskarbitrationd.te#12 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/diskarbitrationd.te#12 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:04:15 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13FA416A4D5; Mon, 22 Jan 2007 20:04:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DCBE916A412 for ; Mon, 22 Jan 2007 20:04:14 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CA75113C45E for ; Mon, 22 Jan 2007 20:04:14 +0000 (UTC) (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 l0MK4EKx089145 for ; Mon, 22 Jan 2007 20:04:14 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MK4EcU089141 for perforce@freebsd.org; Mon, 22 Jan 2007 20:04:14 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:04:14 GMT Message-Id: <200701222004.l0MK4EcU089141@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 113406 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:04:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=113406 Change 113406 by millert@millert_macbook on 2007/01/22 20:04:12 Move /System labeling from DirectoryService.fc to darwin.fc. Label /Library Label /.Trashes as tmp_t. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/DirectoryService.fc#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.fc#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/DirectoryService.fc#5 (text+ko) ==== @@ -12,6 +12,3 @@ /private/var/run/.DSRunningSP1 -- gen_context(system_u:object_r:DirectoryService_var_run_t,s0) - -#/System -/System -d gen_context(system_u:object_r:darwin_system_t,s0) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.fc#8 (text+ko) ==== @@ -10,10 +10,12 @@ # # /System # +/System.* gen_context(system_u:object_r:darwin_system_t,s0) /System/Library/LoginPlugins.* gen_context(system_u:object_r:darwin_loginplugin_t,s0) /System/Library/Caches.* gen_context(system_u:object_r:darwin_cache_t,s0) /System/Library/Services.* gen_context(system_u:object_r:darwin_services_t,s0) /System/Library/Security.* gen_context(system_u:object_r:darwin_security_t,s0) +/System/Library/StartupItems.* gen_context(system_u:object_r:darwin_startup_t,s0) /System/Library/CoreServices.* gen_context(system_u:object_r:darwin_CoreServices_t,s0) /System/Library/ColorSync.* gen_context(system_u:object_r:darwin_resource_t,s0) @@ -25,6 +27,7 @@ # # /Library # +/Library.* gen_context(system_u:object_r:lib_t,s0) /Library/Caches.* gen_context(system_u:object_r:darwin_cache_t,s0) /Library/ColorSync.* gen_context(system_u:object_r:darwin_resource_t,s0) /Library/Preferences/.GlobalPreferences.plist -- gen_context(system_u:object_r:darwin_global_pref_t,s0) @@ -34,3 +37,6 @@ # Kernel /mach_kernel -- gen_context(system_u:object_r:boot_t,s0) + +# Misc +/.Trashes.* gen_context(system_u:object_r:tmp_t,s0) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:05:16 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D013F16A404; Mon, 22 Jan 2007 20:05:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id ADBE816A400 for ; Mon, 22 Jan 2007 20:05:16 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8CF4313C474 for ; Mon, 22 Jan 2007 20:05:16 +0000 (UTC) (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 l0MK5Gfr089472 for ; Mon, 22 Jan 2007 20:05:16 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MK5G97089469 for perforce@freebsd.org; Mon, 22 Jan 2007 20:05:16 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:05:16 GMT Message-Id: <200701222005.l0MK5G97089469@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 113407 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:05:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=113407 Change 113407 by millert@millert_macbook on 2007/01/22 20:04:30 Allow access to /System/Library/StartupItems. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#15 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.te#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.te#12 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#15 (text+ko) ==== @@ -87,6 +87,10 @@ configd_allow_resource_read(configd_t) configd_allow_resource_execute(configd_t) +# Read /System/Library/StartupItems +allow configd_t darwin_startup_t:dir { read search getattr }; +allow configd_t darwin_startup_t:file { execute execute_no_trans read ioctl getattr }; + # Allow configd to start ntpdate ntp_domtrans_ntpdate(configd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.te#4 (text+ko) ==== @@ -12,6 +12,7 @@ type darwin_system_t; type darwin_resource_t; type darwin_security_t; +type darwin_startup_t; type darwin_private_t; type darwin_loginplugin_t; type darwin_cache_t; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.te#12 (text+ko) ==== @@ -658,6 +658,11 @@ darwin_allow_global_pref_read(init_t) darwin_allow_host_pref_read(init_t) darwin_allow_system_read(init_t) +allow init_t darwin_system_t:file execute; + +# Read /System/Library/StartupItems +allow init_t darwin_startup_t:dir { read search getattr }; +allow init_t darwin_startup_t:file { execute execute_no_trans read ioctl getattr }; # Use Frameworks frameworks_read(init_t) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:05:25 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5154016A522; Mon, 22 Jan 2007 20:05:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0FF0E16A507 for ; Mon, 22 Jan 2007 20:05:24 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9CA2513C480 for ; Mon, 22 Jan 2007 20:05:17 +0000 (UTC) (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 l0MK5G7N089479 for ; Mon, 22 Jan 2007 20:05:16 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MK5G54089475 for perforce@freebsd.org; Mon, 22 Jan 2007 20:05:16 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:05:16 GMT Message-Id: <200701222005.l0MK5G54089475@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 113408 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:05:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=113408 Change 113408 by millert@millert_macbook on 2007/01/22 20:05:01 Mountpoint related access. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#16 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#16 (text+ko) ==== @@ -212,3 +212,7 @@ # Search /var/vm files_search_vm(configd_t) + +# Mountpoint perms. +allow configd_t { automount_t darwin_network_t default_t }:dir { search getattr }; +allow configd_t { darwin_network_t default_t }:dir mounton; From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:06:19 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B16D16A405; Mon, 22 Jan 2007 20:06:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 152BF16A400 for ; Mon, 22 Jan 2007 20:06:19 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E1D7413C4BB for ; Mon, 22 Jan 2007 20:06:18 +0000 (UTC) (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 l0MK6Iqs089744 for ; Mon, 22 Jan 2007 20:06:18 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MK6IRb089741 for perforce@freebsd.org; Mon, 22 Jan 2007 20:06:18 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:06:18 GMT Message-Id: <200701222006.l0MK6IRb089741@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 113409 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:06:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=113409 Change 113409 by millert@millert_macbook on 2007/01/22 20:05:28 Search /var/vm. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.te#9 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.te#9 (text+ko) ==== @@ -93,6 +93,9 @@ files_read_var_files(coreservicesd_t) files_read_var_symlinks(coreservicesd_t) +# Search /var/vm +files_search_vm(coreservicesd_t) + # Access cache files allow coreservicesd_t darwin_cache_t:dir { getattr search }; From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:06:20 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E0F1816A4F8; Mon, 22 Jan 2007 20:06:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A6B6916A4F4 for ; Mon, 22 Jan 2007 20:06:19 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7734613C4BC for ; Mon, 22 Jan 2007 20:06:19 +0000 (UTC) (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 l0MK6J9G089753 for ; Mon, 22 Jan 2007 20:06:19 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MK6I6U089747 for perforce@freebsd.org; Mon, 22 Jan 2007 20:06:18 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:06:18 GMT Message-Id: <200701222006.l0MK6I6U089747@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 113410 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:06:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=113410 Change 113410 by millert@millert_macbook on 2007/01/22 20:05:38 Labels for /Network and /automount. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.fc#9 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.fc#9 (text+ko) ==== @@ -40,3 +40,5 @@ # Misc /.Trashes.* gen_context(system_u:object_r:tmp_t,s0) +/Network.* gen_context(system_u:object_r:darwin_network_t,s0) +/automount gen_context(system_u:object_r:automount_t,s0) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:06:20 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B54D116A586; Mon, 22 Jan 2007 20:06:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DA50F16A4F5 for ; Mon, 22 Jan 2007 20:06:19 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CA67313C4BD for ; Mon, 22 Jan 2007 20:06:19 +0000 (UTC) (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 l0MK6J2T089766 for ; Mon, 22 Jan 2007 20:06:19 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MK6JdH089760 for perforce@freebsd.org; Mon, 22 Jan 2007 20:06:19 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:06:19 GMT Message-Id: <200701222006.l0MK6JdH089760@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 113411 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:06:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=113411 Change 113411 by millert@millert_macbook on 2007/01/22 20:06:09 Add types. Add fs_associate(). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.te#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.te#5 (text+ko) ==== @@ -18,3 +18,10 @@ type darwin_cache_t; type darwin_trash_t; type darwin_keychain_t; +type darwin_network_t; +type automount_t; + +fs_associate(darwin_cache_t) +fs_associate(darwin_keychain_t) +fs_associate(darwin_global_pref_t) +fs_associate(darwin_private_t) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:07:22 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1135716A408; Mon, 22 Jan 2007 20:07:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A67E016A407 for ; Mon, 22 Jan 2007 20:07:21 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9752613C4C8 for ; Mon, 22 Jan 2007 20:07:21 +0000 (UTC) (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 l0MK7L4V090021 for ; Mon, 22 Jan 2007 20:07:21 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MK7L39090018 for perforce@freebsd.org; Mon, 22 Jan 2007 20:07:21 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:07:21 GMT Message-Id: <200701222007.l0MK7L39090018@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 113412 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:07:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=113412 Change 113412 by millert@millert_macbook on 2007/01/22 20:06:27 Deal with unconfined_t. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.te#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.te#6 (text+ko) ==== @@ -25,3 +25,27 @@ fs_associate(darwin_keychain_t) fs_associate(darwin_global_pref_t) fs_associate(darwin_private_t) + +# Temporary rules for unconfined_t +mach_allow_message(unconfined_t, unconfined_t) +mach_allow_message(unconfined_t, kernel_t) +mach_allow_message(unconfined_t, init_t) +mach_allow_message(unconfined_t, securityd_t) + +allow unconfined_t init_t:mi_bootstrap { bootstrap_look_up bootstrap_subset }; +allow unconfined_t init_t:mi_notify_ipc { notify_server_register_check notify_server_get_state notify_server_register_plain }; +allow unconfined_t { darwin_system_t framework_t darwin_private_t darwin_CoreServices_t darwin_global_pref_t darwin_system_t darwin_host_pref_t var_vm_t }:dir { search getattr }; +allow unconfined_t { darwin_CoreServices_t darwin_global_pref_t darwin_host_pref_t }:file read; +allow unconfined_t framework_t:{file dir lnk_file} read; +allow unconfined_t framework_t:file getattr; + +# Allow communication with unconfined +mach_allow_ipc(configd_t, unconfined_t) +mach_allow_ipc(coreservicesd_t, unconfined_t) +mach_allow_ipc(diskarbitrationd_t, unconfined_t) +mach_allow_ipc(init_t, unconfined_t) +mach_allow_ipc(kextd_t, unconfined_t) +mach_allow_ipc(loginwindow_t, unconfined_t) +mach_allow_ipc(memberd_t, unconfined_t) +mach_allow_ipc(notifyd_t, unconfined_t) +mach_allow_ipc(securityd_t, unconfined_t) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:07:22 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F16416A50F; Mon, 22 Jan 2007 20:07:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0566E16A400 for ; Mon, 22 Jan 2007 20:07:22 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EA55C13C4CB for ; Mon, 22 Jan 2007 20:07:21 +0000 (UTC) (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 l0MK7LXp090028 for ; Mon, 22 Jan 2007 20:07:21 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MK7LUU090024 for perforce@freebsd.org; Mon, 22 Jan 2007 20:07:21 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:07:21 GMT Message-Id: <200701222007.l0MK7LUU090024@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 113413 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:07:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=113413 Change 113413 by millert@millert_macbook on 2007/01/22 20:06:43 Initial pass at loginwindow. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#13 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#13 (text+ko) ==== @@ -32,7 +32,7 @@ term_setattr_console(loginwindow_t) allow loginwindow_t lib_t:file execute_no_trans; allow loginwindow_t self:fd use; -allow loginwindow_t self:process { taskforpid signal }; # XXX +allow loginwindow_t self:process { taskforpid signal ptrace }; # XXX allow loginwindow_t self:shm { create read setattr write }; allow loginwindow_t self:socket { connect write }; allow loginwindow_t self:udp_socket create; @@ -46,8 +46,13 @@ allow loginwindow_t volfs_t:dir search; # There has to be a "proper" interface for this. Fix this when we find it -allow loginwindow_t bin_t:dir search; -allow loginwindow_t bin_t:file { execute execute_no_trans read }; +allow loginwindow_t bin_t:dir { search read getattr }; +allow loginwindow_t bin_t:file { getattr execute execute_no_trans read }; + +allow loginwindow_t darwin_services_t:dir { read search getattr }; + +allow loginwindow_t init_t:process taskforpid; +allow loginwindow_t unconfined_t:process getsched; # Talk to self mach_allow_message(loginwindow_t, loginwindow_t) @@ -136,8 +141,13 @@ # Access tmp files files_read_generic_tmp_files(loginwindow_t) +files_read_generic_tmp_symlinks(loginwindow_t) files_manage_generic_tmp_files(loginwindow_t) +# XXX: label transition for pid file? +files_rw_generic_pids(loginwindow_t) +allow loginwindow_t var_run_t:dir remove_name; + # /var file operations files_rw_var_files(loginwindow_t) files_read_var_symlinks(loginwindow_t) @@ -152,3 +162,7 @@ # Access cache files allow loginwindow_t darwin_cache_t:dir search; + +# Read default_t +files_list_default(loginwindow_t) +files_read_default_files(loginwindow_t) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:08:24 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6DB6116A406; Mon, 22 Jan 2007 20:08:24 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4C4AC16A404 for ; Mon, 22 Jan 2007 20:08:24 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3D27113C467 for ; Mon, 22 Jan 2007 20:08:24 +0000 (UTC) (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 l0MK8OkY090138 for ; Mon, 22 Jan 2007 20:08:24 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MK8NLP090135 for perforce@freebsd.org; Mon, 22 Jan 2007 20:08:23 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:08:23 GMT Message-Id: <200701222008.l0MK8NLP090135@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 113414 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:08:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=113414 Change 113414 by millert@millert_macbook on 2007/01/22 20:07:45 Try to disambiguate file labels for shells and cron executables. Add self mach_port permissions for syslogd_t and memberd_t. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/memberd.te#8 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/corecommands.fc#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/cron.fc#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/logging.te#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/memberd.te#8 (text+ko) ==== @@ -42,8 +42,8 @@ init_allow_shm(memberd_t) init_allow_bootstrap(memberd_t) -# Talk tro self -allow memberd_t self:mach_port make_send_once; +# Talk to self +allow memberd_t self:mach_port { copy_send hold_send send make_send_once }; # Talk to kernel kernel_allow_ipc(memberd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/corecommands.fc#3 (text+ko) ==== @@ -8,7 +8,9 @@ /bin/ksh -- gen_context(system_u:object_r:shell_exec_t,s0) /bin/ls -- gen_context(system_u:object_r:ls_exec_t,s0) /bin/tcsh -- gen_context(system_u:object_r:shell_exec_t,s0) +/bin/csh -- gen_context(system_u:object_r:shell_exec_t,s0) /bin/zsh -- gen_context(system_u:object_r:shell_exec_t,s0) +/bin/zsh-.* -- gen_context(system_u:object_r:shell_exec_t,s0) # # /sbin ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/cron.fc#5 (text+ko) ==== @@ -7,6 +7,9 @@ /usr/sbin/anacron -- gen_context(system_u:object_r:anacron_exec_t,s0) /usr/sbin/atd -- gen_context(system_u:object_r:crond_exec_t,s0) +/usr/sbin/atq -- gen_context(system_u:object_r:crond_exec_t,s0) +/usr/sbin/atrm -- gen_context(system_u:object_r:crond_exec_t,s0) +/usr/sbin/batch -- gen_context(system_u:object_r:crond_exec_t,s0) /usr/sbin/cron(d)? -- gen_context(system_u:object_r:crond_exec_t,s0) /usr/sbin/fcron -- gen_context(system_u:object_r:crond_exec_t,s0) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/logging.te#7 (text+ko) ==== @@ -147,7 +147,7 @@ # Talk to self allow syslogd_t self:socket { bind listen accept read }; -allow syslogd_t self:mach_port make_send_once; +allow syslogd_t self:mach_port { copy_send hold_send send make_send_once }; # Talk to notifyd notifyd_allow_ipc(syslogd_t) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:08:25 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55D2716A51B; Mon, 22 Jan 2007 20:08:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1BB7D16A519 for ; Mon, 22 Jan 2007 20:08:25 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0B3F413C471 for ; Mon, 22 Jan 2007 20:08:25 +0000 (UTC) (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 l0MK8OXC090152 for ; Mon, 22 Jan 2007 20:08:24 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MK8Ou7090148 for perforce@freebsd.org; Mon, 22 Jan 2007 20:08:24 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:08:24 GMT Message-Id: <200701222008.l0MK8Ou7090148@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 113416 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:08:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=113416 Change 113416 by millert@millert_macbook on 2007/01/22 20:08:07 Fix cron and at paths. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/cron.fc#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/cron.fc#6 (text+ko) ==== @@ -3,13 +3,13 @@ /etc/crontab -- gen_context(system_u:object_r:system_cron_spool_t,s0) /usr/bin/at -- gen_context(system_u:object_r:crontab_exec_t,s0) +/usr/bin/atq -- gen_context(system_u:object_r:crontab_exec_t,s0) +/usr/bin/atrm -- gen_context(system_u:object_r:crontab_exec_t,s0) +/usr/bin/batch -- gen_context(system_u:object_r:crontab_exec_t,s0) /usr/bin/(f)?crontab -- gen_context(system_u:object_r:crontab_exec_t,s0) /usr/sbin/anacron -- gen_context(system_u:object_r:anacron_exec_t,s0) /usr/sbin/atd -- gen_context(system_u:object_r:crond_exec_t,s0) -/usr/sbin/atq -- gen_context(system_u:object_r:crond_exec_t,s0) -/usr/sbin/atrm -- gen_context(system_u:object_r:crond_exec_t,s0) -/usr/sbin/batch -- gen_context(system_u:object_r:crond_exec_t,s0) /usr/sbin/cron(d)? -- gen_context(system_u:object_r:crond_exec_t,s0) /usr/sbin/fcron -- gen_context(system_u:object_r:crond_exec_t,s0) @@ -21,17 +21,15 @@ /var/run/fcron\.pid -- gen_context(system_u:object_r:crond_var_run_t,s0) /private/var/run/cron.pid -- gen_context(system_u:object_r:crond_var_run_t,s0) -/var/spool/at -d gen_context(system_u:object_r:cron_spool_t,s0) -/var/spool/at/spool -d gen_context(system_u:object_r:cron_spool_t,s0) -/var/spool/at/[^/]* -- <> +/var/at -d gen_context(system_u:object_r:cron_spool_t,s0) +/var/at/jobs -d gen_context(system_u:object_r:cron_spool_t,s0) +/var/at/spool -d gen_context(system_u:object_r:cron_spool_t,s0) +/var/at/[^/]* -- <> -/var/spool/cron -d gen_context(system_u:object_r:cron_spool_t,s0) -#/var/spool/cron/root -- gen_context(system_u:object_r:sysadm_cron_spool_t,s0) -/var/spool/cron/[^/]* -- <> - -/var/spool/cron/crontabs -d gen_context(system_u:object_r:cron_spool_t,s0) -/var/spool/cron/crontabs/.* -- <> -#/var/spool/cron/crontabs/root -- gen_context(system_u:object_r:sysadm_cron_spool_t,s0) +/var/cron -d gen_context(system_u:object_r:cron_spool_t,s0) +/var/cron/tabs -d gen_context(system_u:object_r:cron_spool_t,s0) +#/var/cron/tabs/root -- gen_context(system_u:object_r:sysadm_cron_spool_t,s0) +/var/cron/tabs/[^/]* -- <> /var/spool/fcron -d gen_context(system_u:object_r:cron_spool_t,s0) /var/spool/fcron/.* <> From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:09:27 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 075E716A409; Mon, 22 Jan 2007 20:09:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BB98B16A405 for ; Mon, 22 Jan 2007 20:09:26 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id ABD0A13C4DB for ; Mon, 22 Jan 2007 20:09:26 +0000 (UTC) (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 l0MK9QdW090397 for ; Mon, 22 Jan 2007 20:09:26 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MK9QQc090394 for perforce@freebsd.org; Mon, 22 Jan 2007 20:09:26 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:09:26 GMT Message-Id: <200701222009.l0MK9QQc090394@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 113417 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:09:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=113417 Change 113417 by millert@millert_macbook on 2007/01/22 20:08:33 chfn and chsh are links to chpass so they need the same label. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/usermanage.fc#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/admin/usermanage.fc#3 (text+ko) ==== @@ -1,6 +1,7 @@ /usr/bin/chage -- gen_context(system_u:object_r:passwd_exec_t,s0) /usr/bin/chfn -- gen_context(system_u:object_r:chfn_exec_t,s0) /usr/bin/chsh -- gen_context(system_u:object_r:chfn_exec_t,s0) +/usr/bin/chpass -- gen_context(system_u:object_r:chfn_exec_t,s0) /usr/bin/gpasswd -- gen_context(system_u:object_r:groupadd_exec_t,s0) /usr/bin/passwd -- gen_context(system_u:object_r:passwd_exec_t,s0) /usr/bin/vigr -- gen_context(system_u:object_r:admin_passwd_exec_t,s0) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:09:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3134E16A4AB; Mon, 22 Jan 2007 20:09:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 016B316A403 for ; Mon, 22 Jan 2007 20:09:27 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E6BBC13C4DE for ; Mon, 22 Jan 2007 20:09:26 +0000 (UTC) (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 l0MK9QbO090404 for ; Mon, 22 Jan 2007 20:09:26 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MK9QwT090400 for perforce@freebsd.org; Mon, 22 Jan 2007 20:09:26 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:09:26 GMT Message-Id: <200701222009.l0MK9QwT090400@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 113418 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:09:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=113418 Change 113418 by millert@millert_macbook on 2007/01/22 20:08:53 Add rdump (a hard link to dump). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/fstools.fc#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/fstools.fc#4 (text+ko) ==== @@ -1,4 +1,5 @@ /sbin/dump -- gen_context(system_u:object_r:fsadm_exec_t,s0) +/sbin/rdump -- gen_context(system_u:object_r:fsadm_exec_t,s0) /usr/sbin/fdisk -- gen_context(system_u:object_r:fsadm_exec_t,s0) /sbin/fsck.* -- gen_context(system_u:object_r:fsadm_exec_t,s0) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:11:30 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 948D816A405; Mon, 22 Jan 2007 20:11:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5689C16A401 for ; Mon, 22 Jan 2007 20:11:30 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 473A213C457 for ; Mon, 22 Jan 2007 20:11:30 +0000 (UTC) (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 l0MKBU6d090975 for ; Mon, 22 Jan 2007 20:11:30 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MKBUUt090970 for perforce@freebsd.org; Mon, 22 Jan 2007 20:11:30 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:11:30 GMT Message-Id: <200701222011.l0MKBUUt090970@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 113419 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:11:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=113419 Change 113419 by millert@millert_macbook on 2007/01/22 20:10:40 Permit hold_send for coreservicesd_t. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/notifyd.te#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/notifyd.te#7 (text+ko) ==== @@ -49,7 +49,7 @@ memberd_allow_ipc(notifyd_t) # Talk to CoreServices -allow notifyd_t coreservicesd_t:mach_port { hold_send_once send move_send_once }; +allow notifyd_t coreservicesd_t:mach_port { hold_send hold_send_once send move_send_once }; # Allow signalling of other processes allow notifyd_t init_t:process signal; From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:12:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 738D916A403; Mon, 22 Jan 2007 20:12:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 39BB816A400 for ; Mon, 22 Jan 2007 20:12:32 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2988B13C4A6 for ; Mon, 22 Jan 2007 20:12:32 +0000 (UTC) (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 l0MKCWW0091324 for ; Mon, 22 Jan 2007 20:12:32 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MKCVCh091321 for perforce@freebsd.org; Mon, 22 Jan 2007 20:12:31 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:12:31 GMT Message-Id: <200701222012.l0MKCVCh091321@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 113420 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:12:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=113420 Change 113420 by millert@millert_macbook on 2007/01/22 20:11:54 Allow actions by various processes that occur after the user has logged in via the GUI. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/DirectoryService.te#8 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/KernelEventAgent.te#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.te#12 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreaudiod.te#10 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.te#10 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#14 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#15 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ntp.te#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.te#13 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/DirectoryService.te#8 (text+ko) ==== @@ -28,7 +28,7 @@ # Check in /etc/selinux/refpolicy/include for macros to use instead of allow rules. # Some common macros (you might be able to remove some) -files_read_etc_files(DirectoryService_t) +files_manage_etc_files(DirectoryService_t) libs_use_ld_so(DirectoryService_t) libs_use_shared_libs(DirectoryService_t) miscfiles_read_localization(DirectoryService_t) @@ -70,6 +70,7 @@ allow DirectoryService_t self:process signal; allow DirectoryService_t self:socket create; allow DirectoryService_t bin_t:dir search; +allow DirectoryService_t bin_t:file { execute_no_trans read getattr }; allow DirectoryService_t nfs_t:dir { getattr read }; @@ -129,3 +130,8 @@ # Use CoreServices darwin_allow_CoreServices_read(DirectoryService_t) + +# Search /var/vm +files_search_vm(DirectoryService_t) + +corenet_tcp_connect_smbd_port(DirectoryService_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/KernelEventAgent.te#6 (text+ko) ==== @@ -46,3 +46,6 @@ # read /System darwin_allow_system_read(KernelEventAgent_t) + +# Read Core Services files +darwin_allow_CoreServices_read(KernelEventAgent_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.te#12 (text+ko) ==== @@ -82,7 +82,7 @@ # Find the proper interface for this later allow WindowServer_t var_log_t:dir search; -allow WindowServer_t var_log_t:file { getattr setattr write }; +allow WindowServer_t var_log_t:file { getattr setattr write unlink }; # Misc allow WindowServer_t nfs_t:filesystem getattr; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreaudiod.te#10 (text+ko) ==== @@ -32,7 +32,7 @@ allow coreaudiod_t sbin_t:dir { getattr read search }; allow coreaudiod_t mnt_t:dir search; allow coreaudiod_t random_device_t:chr_file read; - +allow coreaudiod_t fs_t:filesystem getattr; # Talking to itself mach_allow_message(coreaudiod_t, coreaudiod_t) @@ -61,10 +61,16 @@ # Allow reading of prefs darwin_allow_global_pref_read(coreaudiod_t) darwin_allow_host_pref_read(coreaudiod_t) +allow coreaudiod_t darwin_host_pref_t:dir { add_name remove_name }; +allow coreaudiod_t darwin_host_pref_t:file { create write setattr rename unlink }; # Allow reading of CoreServices files darwin_allow_CoreServices_read(coreaudiod_t) +# Talk to coreservicesd +mach_allow_ipc(coreaudiod_t, coreservicesd_t) +allow coreaudiod_t coreservicesd_t:shm { read write }; + # Allow reading of /private darwin_allow_private_read(coreaudiod_t) @@ -74,3 +80,6 @@ # read /System darwin_allow_system_read(coreaudiod_t) + +# Search /.vol +allow coreaudiod_t volfs_t:dir search; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.te#10 (text+ko) ==== @@ -42,6 +42,9 @@ WindowServer_allow_ipc(coreservicesd_t) allow coreservicesd_t WindowServer_t:process taskforpid; +# Talk to Coreaudiod +allow coreservicesd_t coreaudiod_t:process taskforpid; + # Talk to configd configd_allow_ipc(coreservicesd_t) allow coreservicesd_t configd_t:process taskforpid; @@ -53,7 +56,7 @@ # Talk to init process allow coreservicesd_t init_t:process taskforpid; allow coreservicesd_t init_t:mi_bootstrap { bootstrap_look_up bootstrap_check_in }; -allow coreservicesd_t init_t:mi_notify_ipc notify_server_register_plain; +allow coreservicesd_t init_t:mi_notify_ipc { notify_server_register_plain notify_server_post }; # Use CoreServices darwin_allow_CoreServices_read(coreservicesd_t) @@ -85,9 +88,11 @@ allow coreservicesd_t kextd_t:process taskforpid; allow coreservicesd_t kextd_t:mach_port { hold_send_once hold_send move_send_once send recv }; -# Read user home dirs +# user home dirs userdom_search_all_users_home_content(coreservicesd_t) userdom_read_all_users_home_content_files(coreservicesd_t) +allow coreservicesd_t user_home_t:dir { add_name remove_name }; +allow coreservicesd_t user_home_t:file { create write setattr rename unlink }; # Read var files files_read_var_files(coreservicesd_t) @@ -97,7 +102,8 @@ files_search_vm(coreservicesd_t) # Access cache files -allow coreservicesd_t darwin_cache_t:dir { getattr search }; +allow coreservicesd_t darwin_cache_t:dir { getattr search add_name remove_name }; +allow coreservicesd_t darwin_cache_t:file { create write rename unlink read }; # Search dirs allow coreservicesd_t { darwin_system_t mnt_t fs_t }:dir { getattr search }; @@ -108,3 +114,6 @@ # Stat filesystems allow coreservicesd_t fs_t:filesystem getattr; + +# /dev/random +allow coreservicesd_t random_device_t:chr_file read; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#14 (text+ko) ==== @@ -48,11 +48,11 @@ # There has to be a "proper" interface for this. Fix this when we find it allow loginwindow_t bin_t:dir { search read getattr }; allow loginwindow_t bin_t:file { getattr execute execute_no_trans read }; +allow loginwindow_t automount_t:dir search; allow loginwindow_t darwin_services_t:dir { read search getattr }; allow loginwindow_t init_t:process taskforpid; -allow loginwindow_t unconfined_t:process getsched; # Talk to self mach_allow_message(loginwindow_t, loginwindow_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#15 (text+ko) ==== @@ -42,7 +42,12 @@ allow securityd_t nfs_t:lnk_file read; allow securityd_t usr_t:file { getattr read }; allow securityd_t random_device_t:chr_file { read write }; +allow securityd_t bin_t:dir { search read }; +allow securityd_t bin_t:file { read getattr }; allow securityd_t sbin_t:dir { getattr read search }; +allow securityd_t automount_t:dir search; +allow securityd_t darwin_network_t:dir { getattr search }; +allow securityd_t darwin_network_t:lnk_file { getattr read }; # /var file operations files_manage_var_files(securityd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/ntp.te#5 (text+ko) ==== @@ -54,6 +54,7 @@ # for some reason it creates a file in /tmp allow ntpd_t ntpd_tmp_t:dir create_dir_perms; allow ntpd_t ntpd_tmp_t:file create_file_perms; +allow ntpd_t tmp_t:lnk_file read; files_tmp_filetrans(ntpd_t, ntpd_tmp_t, { file dir }) allow ntpd_t ntpd_var_run_t:file create_file_perms; @@ -141,6 +142,8 @@ # Read /private darwin_allow_private_read(ntpd_t) +allow ntpd_t random_device_t:chr_file read; + ifdef(`targeted_policy', ` term_dontaudit_use_unallocated_ttys(ntpd_t) term_dontaudit_use_generic_ptys(ntpd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.te#13 (text+ko) ==== @@ -659,6 +659,7 @@ darwin_allow_host_pref_read(init_t) darwin_allow_system_read(init_t) allow init_t darwin_system_t:file execute; +allow init_t automount_t:dir search; # Read /System/Library/StartupItems allow init_t darwin_startup_t:dir { read search getattr }; From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:14:36 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4ECBD16A405; Mon, 22 Jan 2007 20:14:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F122216A402 for ; Mon, 22 Jan 2007 20:14:35 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D847813C455 for ; Mon, 22 Jan 2007 20:14:35 +0000 (UTC) (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 l0MKEZEZ091972 for ; Mon, 22 Jan 2007 20:14:35 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MKEZIB091969 for perforce@freebsd.org; Mon, 22 Jan 2007 20:14:35 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:14:35 GMT Message-Id: <200701222014.l0MKEZIB091969@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 113421 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:14:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=113421 Change 113421 by millert@millert_macbook on 2007/01/22 20:14:27 Conditionalize rules for unconfined_t. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.te#7 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.te#7 (text+ko) ==== @@ -26,26 +26,29 @@ fs_associate(darwin_global_pref_t) fs_associate(darwin_private_t) -# Temporary rules for unconfined_t -mach_allow_message(unconfined_t, unconfined_t) -mach_allow_message(unconfined_t, kernel_t) -mach_allow_message(unconfined_t, init_t) -mach_allow_message(unconfined_t, securityd_t) +define(`enable_unconfined', `true') +ifdef(`enable_unconfined',` + # Temporary rules for unconfined_t + mach_allow_message(unconfined_t, unconfined_t) + mach_allow_message(unconfined_t, kernel_t) + mach_allow_message(unconfined_t, init_t) + mach_allow_message(unconfined_t, securityd_t) -allow unconfined_t init_t:mi_bootstrap { bootstrap_look_up bootstrap_subset }; -allow unconfined_t init_t:mi_notify_ipc { notify_server_register_check notify_server_get_state notify_server_register_plain }; -allow unconfined_t { darwin_system_t framework_t darwin_private_t darwin_CoreServices_t darwin_global_pref_t darwin_system_t darwin_host_pref_t var_vm_t }:dir { search getattr }; -allow unconfined_t { darwin_CoreServices_t darwin_global_pref_t darwin_host_pref_t }:file read; -allow unconfined_t framework_t:{file dir lnk_file} read; -allow unconfined_t framework_t:file getattr; + allow unconfined_t init_t:mi_bootstrap { bootstrap_look_up bootstrap_subset }; + allow unconfined_t init_t:mi_notify_ipc { notify_server_register_check notify_server_get_state notify_server_register_plain }; + allow unconfined_t { darwin_system_t framework_t darwin_private_t darwin_CoreServices_t darwin_global_pref_t darwin_system_t darwin_host_pref_t var_vm_t }:dir { search getattr }; + allow unconfined_t { darwin_CoreServices_t darwin_global_pref_t darwin_host_pref_t }:file read; + allow unconfined_t framework_t:{file dir lnk_file} read; + allow unconfined_t framework_t:file getattr; -# Allow communication with unconfined -mach_allow_ipc(configd_t, unconfined_t) -mach_allow_ipc(coreservicesd_t, unconfined_t) -mach_allow_ipc(diskarbitrationd_t, unconfined_t) -mach_allow_ipc(init_t, unconfined_t) -mach_allow_ipc(kextd_t, unconfined_t) -mach_allow_ipc(loginwindow_t, unconfined_t) -mach_allow_ipc(memberd_t, unconfined_t) -mach_allow_ipc(notifyd_t, unconfined_t) -mach_allow_ipc(securityd_t, unconfined_t) + # Allow communication with unconfined + mach_allow_ipc(configd_t, unconfined_t) + mach_allow_ipc(coreservicesd_t, unconfined_t) + mach_allow_ipc(diskarbitrationd_t, unconfined_t) + mach_allow_ipc(init_t, unconfined_t) + mach_allow_ipc(kextd_t, unconfined_t) + mach_allow_ipc(loginwindow_t, unconfined_t) + mach_allow_ipc(memberd_t, unconfined_t) + mach_allow_ipc(notifyd_t, unconfined_t) + mach_allow_ipc(securityd_t, unconfined_t) +') From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:15:38 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E642D16A407; Mon, 22 Jan 2007 20:15:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 909C316A400 for ; Mon, 22 Jan 2007 20:15:37 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 816BE13C44B for ; Mon, 22 Jan 2007 20:15:37 +0000 (UTC) (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 l0MKFbih092101 for ; Mon, 22 Jan 2007 20:15:37 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MKFbOb092098 for perforce@freebsd.org; Mon, 22 Jan 2007 20:15:37 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:15:37 GMT Message-Id: <200701222015.l0MKFbOb092098@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 113422 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:15:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=113422 Change 113422 by millert@millert_macbook on 2007/01/22 20:15:11 More rules for unconfined_t. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.te#8 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.te#8 (text+ko) ==== @@ -25,6 +25,7 @@ fs_associate(darwin_keychain_t) fs_associate(darwin_global_pref_t) fs_associate(darwin_private_t) +fs_associate(darwin_host_pref_t) define(`enable_unconfined', `true') ifdef(`enable_unconfined',` @@ -34,15 +35,51 @@ mach_allow_message(unconfined_t, init_t) mach_allow_message(unconfined_t, securityd_t) - allow unconfined_t init_t:mi_bootstrap { bootstrap_look_up bootstrap_subset }; - allow unconfined_t init_t:mi_notify_ipc { notify_server_register_check notify_server_get_state notify_server_register_plain }; - allow unconfined_t { darwin_system_t framework_t darwin_private_t darwin_CoreServices_t darwin_global_pref_t darwin_system_t darwin_host_pref_t var_vm_t }:dir { search getattr }; - allow unconfined_t { darwin_CoreServices_t darwin_global_pref_t darwin_host_pref_t }:file read; - allow unconfined_t framework_t:{file dir lnk_file} read; - allow unconfined_t framework_t:file getattr; + allow unconfined_t init_t:mi_bootstrap { bootstrap_look_up bootstrap_subset bootstrap_register bootstrap_parent bootstrap_create_service bootstrap_create_server }; + allow unconfined_t init_t:mi_notify_ipc { notify_server_register_check notify_server_get_state notify_server_register_plain notify_server_monitor_file notify_server_register_mach_port notify_server_post notify_server_monitor_file notify_server_cancel }; + allow unconfined_t { darwin_host_pref_t var_vm_t }:dir { search getattr }; + allow unconfined_t { darwin_host_pref_t }:file read; + allow unconfined_t framework_t:{file lnk_file} { read getattr }; + allow unconfined_t framework_t:dir { read getattr search }; + allow unconfined_t framework_t:file { getattr execute_no_trans execute }; + allow unconfined_t darwin_keychain_t:file { getattr read }; + allow unconfined_t darwin_keychain_t:dir search; + + allow unconfined_t darwin_private_t:dir { search getattr read }; + + allow unconfined_t darwin_system_t:file { execute getattr read execute_no_trans }; + allow unconfined_t darwin_system_t:lnk_file { read getattr }; + allow unconfined_t darwin_system_t:dir { read search getattr }; + + allow unconfined_t darwin_cache_t:file { read write lock getattr create }; + allow unconfined_t darwin_cache_t:dir { search getattr add_name }; + + allow unconfined_t darwin_global_pref_t:file { create write setattr rename unlink read }; + allow unconfined_t darwin_global_pref_t:dir { add_name remove_name search getattr }; + + allow unconfined_t darwin_CoreServices_t:file { read getattr execute_no_trans }; + allow unconfined_t darwin_CoreServices_t:dir { read search getattr }; + + allow unconfined_t darwin_security_t:dir { search getattr read }; + + allow unconfined_t configd_resource_t:file read; + allow unconfined_t configd_resource_t:dir { read search }; + + allow unconfined_t automount_t:dir search; + + allow unconfined_t WindowServer_resource_t:file read; + allow unconfined_t WindowServer_resource_t:dir { read search }; + + allow unconfined_t init_t:mi_bootstrap { bootstrap_register bootstrap_parent bootstrap_create_service bootstrap_create_server }; + + allow unconfined_t darwin_resource_t:dir {search getattr }; + allow unconfined_t darwin_resource_t:file { read getattr }; + + allow unconfined_t bsdpty_device_t:file ioctl; # Allow communication with unconfined mach_allow_ipc(configd_t, unconfined_t) + mach_allow_ipc(coreaudiod_t, unconfined_t) mach_allow_ipc(coreservicesd_t, unconfined_t) mach_allow_ipc(diskarbitrationd_t, unconfined_t) mach_allow_ipc(init_t, unconfined_t) @@ -51,4 +88,8 @@ mach_allow_ipc(memberd_t, unconfined_t) mach_allow_ipc(notifyd_t, unconfined_t) mach_allow_ipc(securityd_t, unconfined_t) + mach_allow_ipc(mDNSResponder_t, unconfined_t) + + allow coreservicesd_t unconfined_t:process taskforpid; + allow loginwindow_t unconfined_t:process getsched; ') From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:16:39 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B147A16A410; Mon, 22 Jan 2007 20:16:39 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 62E8016A401 for ; Mon, 22 Jan 2007 20:16:39 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 53F2C13C44C for ; Mon, 22 Jan 2007 20:16:39 +0000 (UTC) (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 l0MKGdM7092172 for ; Mon, 22 Jan 2007 20:16:39 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MKGdwb092169 for perforce@freebsd.org; Mon, 22 Jan 2007 20:16:39 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:16:39 GMT Message-Id: <200701222016.l0MKGdwb092169@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 113423 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:16:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=113423 Change 113423 by millert@millert_macbook on 2007/01/22 20:16:15 loginwindow needs access to sbin and /dev/urandom. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#15 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#15 (text+ko) ==== @@ -44,10 +44,13 @@ allow loginwindow_t nfs_t:lnk_file { getattr read }; allow loginwindow_t usr_t:file { getattr read }; allow loginwindow_t volfs_t:dir search; +allow loginwindow_t random_device_t:chr_file read; # There has to be a "proper" interface for this. Fix this when we find it allow loginwindow_t bin_t:dir { search read getattr }; allow loginwindow_t bin_t:file { getattr execute execute_no_trans read }; +allow loginwindow_t sbin_t:dir { search read getattr }; +allow loginwindow_t sbin_t:file { getattr execute execute_no_trans read }; allow loginwindow_t automount_t:dir search; allow loginwindow_t darwin_services_t:dir { read search getattr }; From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:17:41 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E34916A412; Mon, 22 Jan 2007 20:17:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3349A16A46F for ; Mon, 22 Jan 2007 20:17:41 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 240D213C474 for ; Mon, 22 Jan 2007 20:17:41 +0000 (UTC) (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 l0MKHerk093043 for ; Mon, 22 Jan 2007 20:17:41 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MKHesK093037 for perforce@freebsd.org; Mon, 22 Jan 2007 20:17:40 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:17:40 GMT Message-Id: <200701222017.l0MKHesK093037@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 113424 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:17:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=113424 Change 113424 by millert@millert_macbook on 2007/01/22 20:16:40 TCP connections for WindowServer. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.te#13 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/WindowServer.te#13 (text+ko) ==== @@ -44,7 +44,9 @@ # FDs and sockets and consoles oh my! allow WindowServer_t self:fd use; allow WindowServer_t self:udp_socket create; +allow WindowServer_t self:tcp_socket create; allow WindowServer_t console_device_t:chr_file setattr; +corenet_tcp_sendrecv_all_if(WindowServer_t) # Allow WindowServer to talk to launchd init_allow_ipc(WindowServer_t) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:17:41 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFE9F16A54B; Mon, 22 Jan 2007 20:17:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AC5BD16A4EF for ; Mon, 22 Jan 2007 20:17:41 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7DA2B13C4A5 for ; Mon, 22 Jan 2007 20:17:41 +0000 (UTC) (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 l0MKHfie093056 for ; Mon, 22 Jan 2007 20:17:41 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MKHf0i093049 for perforce@freebsd.org; Mon, 22 Jan 2007 20:17:41 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:17:41 GMT Message-Id: <200701222017.l0MKHf0i093049@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 113425 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:17:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=113425 Change 113425 by millert@millert_macbook on 2007/01/22 20:17:39 configd needs to be able to getattr not just read modules_object_t:file Children spawned by configd need to be able to check /var/run pid files. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#17 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#17 (text+ko) ==== @@ -125,7 +125,7 @@ # Allow configd to load kexts allow configd_t modules_object_t:dir { read search }; -allow configd_t modules_object_t:file read; +allow configd_t modules_object_t:file { read getattr }; # Allow configd to run ifconfig allow configd_t ifconfig_exec_t:file { execute_no_trans getattr read }; @@ -172,6 +172,9 @@ # Not sure why it wants to search this dir, it should know what it wants allow configd_t var_log_t:dir search; +# Configd child processes needs access to pid files +allow configd_t init_var_run_t:file { getattr read }; + # Search /var/vm files_search_vm(securityd_t) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:18:48 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A28F16A49C; Mon, 22 Jan 2007 20:18:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C15F816A47C for ; Mon, 22 Jan 2007 20:18:47 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E398E13C4F3 for ; Mon, 22 Jan 2007 20:18:46 +0000 (UTC) (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 l0MKIhfh093950 for ; Mon, 22 Jan 2007 20:18:43 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MKIh84093947 for perforce@freebsd.org; Mon, 22 Jan 2007 20:18:43 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:18:43 GMT Message-Id: <200701222018.l0MKIh84093947@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 113427 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:18:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=113427 Change 113427 by millert@millert_macbook on 2007/01/22 20:18:33 Allow getattr/read for symlinks too. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#17 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#17 (text+ko) ==== @@ -127,6 +127,7 @@ # Note: Not sure of the best way to do this "for real" allow loginwindow_t fs_t:dir { getattr read search }; allow loginwindow_t fs_t:file { getattr read }; +allow loginwindow_t fs_t:lnk_file { getattr read }; # Read/Write utmp init_rw_utmp(loginwindow_t) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:18:49 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3361C16A4A0; Mon, 22 Jan 2007 20:18:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E11FB16A48F for ; Mon, 22 Jan 2007 20:18:47 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0660E13C500 for ; Mon, 22 Jan 2007 20:18:45 +0000 (UTC) (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 l0MKIhCn093944 for ; Mon, 22 Jan 2007 20:18:43 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MKIhUK093941 for perforce@freebsd.org; Mon, 22 Jan 2007 20:18:43 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:18:43 GMT Message-Id: <200701222018.l0MKIhUK093941@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 113426 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:18:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=113426 Change 113426 by millert@millert_macbook on 2007/01/22 20:18:14 Relabel /Applications as darwin_applications_t (was bin_t). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#18 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.te#11 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#16 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/notifyd.te#8 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#16 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/kernel.te#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.fc#10 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.te#9 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.te#14 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#18 (text+ko) ==== @@ -83,6 +83,9 @@ allow configd_t sbin_t:dir { getattr read search }; allow configd_t sbin_t:file { execute_no_trans getattr read }; +allow configd_t darwin_applications_t:dir { search read }; +allow configd_t darwin_applications_t:file { read getattr }; + # Execute configd helpers configd_allow_resource_read(configd_t) configd_allow_resource_execute(configd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/coreservicesd.te#11 (text+ko) ==== @@ -38,6 +38,9 @@ # Talk to kernel kernel_allow_ipc(coreservicesd_t) +# Talk to notifyd +notifyd_allow_shm(coreservicesd_t) + # Talk to WindowServer WindowServer_allow_ipc(coreservicesd_t) allow coreservicesd_t WindowServer_t:process taskforpid; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/loginwindow.te#16 (text+ko) ==== @@ -55,6 +55,9 @@ allow loginwindow_t darwin_services_t:dir { read search getattr }; +allow loginwindow_t darwin_applications_t:dir { search getattr read }; +allow loginwindow_t darwin_applications_t:file { read getattr }; + allow loginwindow_t init_t:process taskforpid; # Talk to self ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/notifyd.te#8 (text+ko) ==== @@ -60,3 +60,4 @@ # /var operations files_read_var_symlinks(notifyd_t) +allow notifyd_t var_t:file write; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/securityd.te#16 (text+ko) ==== @@ -49,6 +49,9 @@ allow securityd_t darwin_network_t:dir { getattr search }; allow securityd_t darwin_network_t:lnk_file { getattr read }; +allow securityd_t darwin_applications_t:dir { getattr search read }; +allow securityd_t darwin_applications_t:file { getattr read }; + # /var file operations files_manage_var_files(securityd_t) files_manage_var_dirs(securityd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/kernel.te#5 (text+ko) ==== @@ -236,6 +236,8 @@ files_list_home(kernel_t) files_read_usr_files(kernel_t) +allow kernel_t darwin_applications_t:file read; + mcs_process_set_categories(kernel_t) mls_process_read_up(kernel_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.fc#10 (text+ko) ==== @@ -22,7 +22,7 @@ # # Applications # -/Applications.* gen_context(system_u:object_r:bin_t,s0) +/Applications.* gen_context(system_u:object_r:darwin_applications_t,s0) # # /Library ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.te#9 (text+ko) ==== @@ -5,6 +5,7 @@ # Declarations # +type darwin_applications_t; type darwin_global_pref_t; type darwin_host_pref_t; type darwin_CoreServices_t; @@ -51,6 +52,9 @@ allow unconfined_t darwin_system_t:lnk_file { read getattr }; allow unconfined_t darwin_system_t:dir { read search getattr }; + allow unconfined_t darwin_applications_t:dir { search getattr read }; + allow unconfined_t darwin_applications_t:file { read getattr execute_no_trans execute }; + allow unconfined_t darwin_cache_t:file { read write lock getattr create }; allow unconfined_t darwin_cache_t:dir { search getattr add_name }; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.te#14 (text+ko) ==== @@ -665,6 +665,9 @@ allow init_t darwin_startup_t:dir { read search getattr }; allow init_t darwin_startup_t:file { execute execute_no_trans read ioctl getattr }; +allow init_t darwin_applications_t:dir { search getattr read }; +allow init_t darwin_applications_t:file { read getattr }; + # Use Frameworks frameworks_read(init_t) frameworks_execute(init_t) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:20:48 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D83416A406; Mon, 22 Jan 2007 20:20:48 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D10C516A401 for ; Mon, 22 Jan 2007 20:20:47 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C21B113C457 for ; Mon, 22 Jan 2007 20:20:47 +0000 (UTC) (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 l0MKKl9L094250 for ; Mon, 22 Jan 2007 20:20:47 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MKKlgH094246 for perforce@freebsd.org; Mon, 22 Jan 2007 20:20:47 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:20:47 GMT Message-Id: <200701222020.l0MKKlgH094246@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 113428 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:20:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=113428 Change 113428 by millert@millert_macbook on 2007/01/22 20:20:40 Add TCP/UDP netif permissions as needed. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/DirectoryService.te#9 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#19 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/lookupd.te#8 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/mDNSResponder.te#9 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/DirectoryService.te#9 (text+ko) ==== @@ -134,4 +134,7 @@ # Search /var/vm files_search_vm(DirectoryService_t) +# Networking corenet_tcp_connect_smbd_port(DirectoryService_t) +corenet_tcp_sendrecv_all_if(DirectoryService_t) +corenet_udp_sendrecv_all_if(DirectoryService_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#19 (text+ko) ==== @@ -47,6 +47,7 @@ ## Networking basics (adjust to your needs!) sysnet_dns_name_resolve(configd_t) +corenet_raw_send_all_if(configd_t) corenet_tcp_sendrecv_all_if(configd_t) corenet_tcp_sendrecv_all_nodes(configd_t) corenet_tcp_sendrecv_all_ports(configd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/lookupd.te#8 (text+ko) ==== @@ -107,3 +107,7 @@ # Read /var files_list_var(lookupd_t) files_read_var_files(lookupd_t) + +# TCP/UDP send/receive +corenet_tcp_sendrecv_all_if(lookupd_t) +corenet_udp_send_all_if(lookupd_t) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/mDNSResponder.te#9 (text+ko) ==== @@ -94,3 +94,6 @@ # Read /sbin allow mDNSResponder_t sbin_t:dir { getattr read search }; + +# UDP send/receive +corenet_udp_sendrecv_all_if(mDNSResponder_t) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:21:50 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D562416A407; Mon, 22 Jan 2007 20:21:49 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9ACFF16A402 for ; Mon, 22 Jan 2007 20:21:49 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8C05613C45B for ; Mon, 22 Jan 2007 20:21:49 +0000 (UTC) (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 l0MKLn3c094902 for ; Mon, 22 Jan 2007 20:21:49 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MKLnrQ094899 for perforce@freebsd.org; Mon, 22 Jan 2007 20:21:49 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:21:49 GMT Message-Id: <200701222021.l0MKLnrQ094899@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 113429 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:21:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=113429 Change 113429 by millert@millert_macbook on 2007/01/22 20:21:42 Allow kernel-generated packets, such as ICMP replies, to be sent. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/corenetwork.te.in#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/corenetwork.te.in#4 (text+ko) ==== @@ -188,6 +188,9 @@ type netif_t, netif_type; sid netif gen_context(system_u:object_r:netif_t,s0 - mls_systemhigh) +# Allow in-kernel transmission for ICMP replies and the like +corenet_raw_send_all_if(netif_t) + build_option(`enable_mls',` network_interface(lo, lo,s0 - mls_systemhigh) ') From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:22:51 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A04E516A531; Mon, 22 Jan 2007 20:22:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6AC5816A530 for ; Mon, 22 Jan 2007 20:22:51 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 59D8E13C428 for ; Mon, 22 Jan 2007 20:22:51 +0000 (UTC) (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 l0MKMp9N095171 for ; Mon, 22 Jan 2007 20:22:51 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MKMp3q095168 for perforce@freebsd.org; Mon, 22 Jan 2007 20:22:51 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:22:51 GMT Message-Id: <200701222022.l0MKMp3q095168@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 113430 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:22:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=113430 Change 113430 by millert@millert_macbook on 2007/01/22 20:22:07 Allow the kernel to send TCP packets that didn't originate from userland. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/corenetwork.if.in#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/corenetwork.te.in#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/corenetwork.if.in#4 (text+ko) ==== @@ -180,6 +180,24 @@ ######################################## ## +## Send TCP network traffic on all interfaces. +## +## +## +## The type of the process performing this action. +## +## +# +interface(`corenet_tcp_send_all_if',` + gen_require(` + attribute netif_type; + ') + + allow $1 netif_type:netif { tcp_send }; +') + +######################################## +## ## Send and receive TCP network traffic on all interfaces. ## ## ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/kernel/corenetwork.te.in#5 (text+ko) ==== @@ -188,8 +188,10 @@ type netif_t, netif_type; sid netif gen_context(system_u:object_r:netif_t,s0 - mls_systemhigh) -# Allow in-kernel transmission for ICMP replies and the like +# Allow in-kernel transmission for ICMP replies and TCP connections +# without a user socket associated with them. corenet_raw_send_all_if(netif_t) +corenet_tcp_send_all_if(netif_t) build_option(`enable_mls',` network_interface(lo, lo,s0 - mls_systemhigh) From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:22:52 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 34D4D16A5BB; Mon, 22 Jan 2007 20:22:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EC34E16A581 for ; Mon, 22 Jan 2007 20:22:51 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AD5AE13C448 for ; Mon, 22 Jan 2007 20:22:51 +0000 (UTC) (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 l0MKMpFs095178 for ; Mon, 22 Jan 2007 20:22:51 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MKMp3i095174 for perforce@freebsd.org; Mon, 22 Jan 2007 20:22:51 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:22:51 GMT Message-Id: <200701222022.l0MKMp3i095174@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 113431 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:22:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=113431 Change 113431 by millert@millert_macbook on 2007/01/22 20:22:25 Allow configd to execute modules. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#20 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/darwin/configd.te#20 (text+ko) ==== @@ -129,7 +129,7 @@ # Allow configd to load kexts allow configd_t modules_object_t:dir { read search }; -allow configd_t modules_object_t:file { read getattr }; +allow configd_t modules_object_t:file { read getattr execute }; # Allow configd to run ifconfig allow configd_t ifconfig_exec_t:file { execute_no_trans getattr read }; From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:23:53 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3A3C16A405; Mon, 22 Jan 2007 20:23:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6A11816A401 for ; Mon, 22 Jan 2007 20:23:53 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5B76813C44C for ; Mon, 22 Jan 2007 20:23:53 +0000 (UTC) (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 l0MKNrR4095565 for ; Mon, 22 Jan 2007 20:23:53 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MKNrHE095562 for perforce@freebsd.org; Mon, 22 Jan 2007 20:23:53 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:23:53 GMT Message-Id: <200701222023.l0MKNrHE095562@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 113432 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:23:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=113432 Change 113432 by millert@millert_macbook on 2007/01/22 20:23:04 Fix a cut and pasto to make --noenforce work properly. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/update_plist#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/update_plist#5 (xtext) ==== @@ -49,8 +49,7 @@ if ($enforcing_mode) { $module_data{'enforce'} = Mac::PropertyList::true->new(); } else { - $module_data{'enforce'} = Mac::PropertyList::true->false(); - #delete $module_data{'enforce'}; + $module_data{'enforce'} = Mac::PropertyList::false->new(); } } From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:23:55 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 442A416A4FA; Mon, 22 Jan 2007 20:23:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 09C5816A4EA for ; Mon, 22 Jan 2007 20:23:53 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B4A9113C457 for ; Mon, 22 Jan 2007 20:23:53 +0000 (UTC) (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 l0MKNrsR095573 for ; Mon, 22 Jan 2007 20:23:53 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MKNraK095568 for perforce@freebsd.org; Mon, 22 Jan 2007 20:23:53 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:23:53 GMT Message-Id: <200701222023.l0MKNraK095568@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 113433 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:23:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=113433 Change 113433 by millert@millert_macbook on 2007/01/22 20:23:26 Enable automount policy; right now most of it is unused. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules.conf#7 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/automount.fc#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.te#10 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules.conf#7 (text+ko) ==== @@ -782,7 +782,7 @@ # # Filesystem automounter service. # -#automount = module +automount = module # Layer: services # Module: avahi ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/services/automount.fc#2 (text+ko) ==== @@ -1,10 +1,4 @@ # -# /etc -# -/etc/apm/event\.d/autofs -- gen_context(system_u:object_r:automount_exec_t,s0) -/etc/auto\..+ -- gen_context(system_u:object_r:automount_etc_t,s0) - -# # /usr # /usr/sbin/automount -- gen_context(system_u:object_r:automount_exec_t,s0) @@ -13,4 +7,4 @@ # /var # -/var/run/autofs(/.*)? gen_context(system_u:object_r:automount_var_run_t,s0) +/var/run/automount\..* gen_context(system_u:object_r:automount_var_run_t,s0) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/darwin.te#10 (text+ko) ==== @@ -20,7 +20,6 @@ type darwin_trash_t; type darwin_keychain_t; type darwin_network_t; -type automount_t; fs_associate(darwin_cache_t) fs_associate(darwin_keychain_t) @@ -69,8 +68,6 @@ allow unconfined_t configd_resource_t:file read; allow unconfined_t configd_resource_t:dir { read search }; - allow unconfined_t automount_t:dir search; - allow unconfined_t WindowServer_resource_t:file read; allow unconfined_t WindowServer_resource_t:dir { read search }; From owner-p4-projects@FreeBSD.ORG Mon Jan 22 20:24:57 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 340DC16A407; Mon, 22 Jan 2007 20:24:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D1DD316A404 for ; Mon, 22 Jan 2007 20:24:56 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C2DDC13C465 for ; Mon, 22 Jan 2007 20:24:56 +0000 (UTC) (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 l0MKOuYi095815 for ; Mon, 22 Jan 2007 20:24:56 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MKOt0P095812 for perforce@freebsd.org; Mon, 22 Jan 2007 20:24:55 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 20:24:55 GMT Message-Id: <200701222024.l0MKOt0P095812@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 113434 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Jan 2007 20:24:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=113434 Change 113434 by millert@millert_macbook on 2007/01/22 20:23:54 Keychain rules. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.te#15 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/modules/system/init.te#15 (text+ko) ==== @@ -668,6 +668,9 @@ allow init_t darwin_applications_t:dir { search getattr read }; allow init_t darwin_applications_t:file { read getattr }; +allow init_t darwin_keychain_t:dir { add_name remove_name }; +allow init_t darwin_keychain_t:file { create write link unlink setattr }; + # Use Frameworks frameworks_read(init_t) frameworks_execute(init_t) From owner-p4-projects@FreeBSD.ORG Tue Jan 23 02:52:04 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C53316A402; Tue, 23 Jan 2007 02:52:04 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DE01E16A40E for ; Tue, 23 Jan 2007 02:52:03 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D065413C4BF for ; Tue, 23 Jan 2007 02:52:03 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0N2q3OE083892 for ; Tue, 23 Jan 2007 02:52:03 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0N2q3pd083889 for perforce@freebsd.org; Tue, 23 Jan 2007 02:52:03 GMT (envelope-from kevlo@freebsd.org) Date: Tue, 23 Jan 2007 02:52:03 GMT Message-Id: <200701230252.l0N2q3pd083889@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 113442 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jan 2007 02:52:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=113442 Change 113442 by kevlo@kevlo_rtsl on 2007/01/23 02:51:24 Distinguish PXA255 Obtained from: NetBSD Affected files ... .. //depot/projects/arm/src/sys/arm/arm/identcpu.c#11 edit Differences ... ==== //depot/projects/arm/src/sys/arm/arm/identcpu.c#11 (text+ko) ==== @@ -140,6 +140,13 @@ "rev 12", "rev 13", "rev 14", "rev 15", }; +static const char * const pxa255_steppings[16] = { + "rev 0", "rev 1", "rev 2", "step A-0", + "rev 4", "step B-0", "step A-0", "rev 7", + "rev 8", "rev 9", "rev 10", "rev 11", + "rev 12", "rev 13", "rev 14", "rev 15", +}; + static const char * const ixp425_steppings[16] = { "step 0 (A0)", "rev 1 (ARMv5TE)", "rev 2", "rev 3", "rev 4", "rev 5", "rev 6", "rev 7", @@ -253,8 +260,8 @@ pxa2x0_steppings }, { CPU_ID_PXA210B, CPU_CLASS_XSCALE, "PXA210", pxa2x0_steppings }, - { CPU_ID_PXA250C, CPU_CLASS_XSCALE, "PXA250", - pxa2x0_steppings }, + { CPU_ID_PXA250C, CPU_CLASS_XSCALE, "PXA255", + pxa255_steppings }, { CPU_ID_PXA210C, CPU_CLASS_XSCALE, "PXA210", pxa2x0_steppings }, From owner-p4-projects@FreeBSD.ORG Tue Jan 23 08:37:43 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2159116A403; Tue, 23 Jan 2007 08:37:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BDAE816A401 for ; Tue, 23 Jan 2007 08:37:42 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A9ED213C448 for ; Tue, 23 Jan 2007 08:37:42 +0000 (UTC) (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 l0N8bgiw055334 for ; Tue, 23 Jan 2007 08:37:42 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0N8bRPT055324 for perforce@freebsd.org; Tue, 23 Jan 2007 08:37:27 GMT (envelope-from bushman@freebsd.org) Date: Tue, 23 Jan 2007 08:37:27 GMT Message-Id: <200701230837.l0N8bRPT055324@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 113450 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jan 2007 08:37:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=113450 Change 113450 by bushman@bushman_nss_ldap_cached on 2007/01/23 08:37:08 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/Makefile.inc1#7 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/rc.conf#12 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/mtree/BSD.usr.dist#6 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/pccard_ether#5 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/abi#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/accounting#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/archdep#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/atm1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/auto_linklocal#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/bluetooth#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/bootconf.sh#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/bridge#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/geli#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/hcsecd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ip6fw#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ipfilter#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ipfw#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ipnat#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/jail#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ldconfig#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/lpd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/mdconfig#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/mdconfig2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/mountcritremote#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/moused#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/natd#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/netif#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/nfsclient#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/nfsserver#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/nsswitch#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/pf#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/pflog#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/pfsync#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/power_profile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/pppoed#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/quota#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/sdpd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/syscons#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/syslogd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ugidfw#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/var#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ypbind#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/yppasswdd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ypserv#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ypset#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ypupdated#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/ypxfrd#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.firewall#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.initdiskless#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.subr#8 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/snmpd.config#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/include/mqueue.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/include/unistd.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/Makefile#13 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/SYS.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gd_qnan.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gen/_setjmp.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gen/ldexp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gen/modf.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gen/setjmp.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/gen/sigsetjmp.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/brk.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/cerror.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/exect.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/pipe.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/ptrace.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/reboot.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/sbrk.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/setlogin.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/sigreturn.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/amd64/sys/vfork.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/arm/gd_qnan.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/creat.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/creat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/gethostid.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/gethostid.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/getwd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/killpg.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/killpg.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/sethostid.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/setpgrp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/setrgid.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/setruid.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/setruid.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/sigcompat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/sigpause.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/sigsetmask.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/compat-43/sigvec.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_close.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_conv.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_debug.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_delete.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_get.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_open.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_overflow.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_page.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_put.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_search.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_seq.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_split.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/bt_utils.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/btree.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/btree/extern.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/db/db.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/hash/extern.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/hash/hash.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/hash/hash.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/hash/hash_bigkey.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/hash/hash_buf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/hash/hash_func.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/hash/hash_log2.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/hash/hash_page.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/hash/ndbm.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/hash/page.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/man/btree.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/man/dbopen.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/man/hash.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/man/mpool.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/man/recno.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/mpool/mpool.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/recno/extern.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/recno/rec_close.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/recno/rec_delete.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/recno/rec_get.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/recno/rec_open.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/recno/rec_put.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/recno/rec_search.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/recno/rec_seq.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/recno/rec_utils.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/recno/recno.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/test/btree.tests/main.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/test/dbtest.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/test/hash.tests/driver2.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/test/hash.tests/tcreat3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/test/hash.tests/tdel.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/test/hash.tests/thash4.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/test/hash.tests/tread2.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/test/hash.tests/tseq.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/db/test/hash.tests/tverify.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gdtoa/_hdtoa.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/__xuname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/_spinlock_stub.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/alarm.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/alarm.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/assert.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/clock.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/clock.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/closedir.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/confstr.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/confstr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/crypt.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/ctermid.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/ctermid.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/daemon.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/daemon.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/devname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/devname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/directory.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/disklabel.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/err.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/err.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/errlst.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/exec.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/exec.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/fnmatch.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/fnmatch.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/frexp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/fstab.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/fts.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/fts.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getbootfile.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getbootfile.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getbsize.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getbsize.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getcap.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getcap.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getcwd.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getcwd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getdiskbyname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getdomainname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getdomainname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getfsent.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getgrent.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getgrouplist.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getgrouplist.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/gethostname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/gethostname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getloadavg.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getloadavg.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getlogin.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getmntinfo.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getmntinfo.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getnetgrent.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getnetgrent.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getosreldate.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getpagesize.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getpagesize.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getpass.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getpwent.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getttyent.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getttyent.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getusershell.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getusershell.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getvfsbyname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getvfsbyname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/glob.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/glob.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/initgroups.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/initgroups.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/isatty.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/ldexp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/modf.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/nice.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/nice.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/nlist.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/nlist.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/opendir.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/pause.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/pause.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/popen.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/popen.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/psignal.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/psignal.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/pwcache.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/pwcache.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/raise.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/raise.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/readdir.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/rewinddir.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/scandir.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/scandir.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/seekdir.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/setdomainname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sethostname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/setjmp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/setjmperr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/setmode.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/setmode.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/siginterrupt.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/siginterrupt.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/siglist.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/signal.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/signal.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sigsetops.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sigsetops.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sleep.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sleep.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/stringlist.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/strtofflags.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/strtofflags.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sysconf.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sysconf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sysctl.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/sysctl.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/syslog.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/syslog.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/tcgetpgrp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/tcsendbreak.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/tcsetattr.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/tcsetpgrp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/telldir.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/termios.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/time.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/time.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/times.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/times.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/timezone.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/timezone.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/ttyname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/ttyname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/ttyslot.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/tzset.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/ualarm.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/ualarm.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/uname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/uname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/unvis.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/unvis.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/usleep.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/usleep.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/utime.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/utime.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/valloc.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/valloc.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/vis.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/vis.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/wait.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/wait3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/waitpid.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gmon/gmon.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gmon/mcount.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gmon/moncontrol.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/SYS.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/gd_qnan.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/gen/_setjmp.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/gen/fabs.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/gen/ldexp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/gen/modf.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/gen/setjmp.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/gen/sigsetjmp.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/stdlib/abs.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/stdlib/div.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/stdlib/labs.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/string/bcopy.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/sys/Ovfork.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/sys/brk.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/sys/cerror.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/sys/exect.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/sys/i386_get_ldt.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/sys/pipe.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/sys/ptrace.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/sys/reboot.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/sys/sbrk.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/sys/setlogin.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/sys/sigreturn.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/i386/sys/syscall.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/ia64/gd_qnan.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/include/libc_private.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/include/spinlock.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/inet/inet_addr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/inet/inet_lnaof.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/inet/inet_makeaddr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/inet/inet_net_ntop.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/inet/inet_netof.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/inet/inet_network.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/inet/inet_ntoa.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/isc/eventlib_p.h#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/ctype.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/digittoint.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/euc.5#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/gbk.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/isalnum.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/isalpha.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/isascii.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/isblank.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/iscntrl.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/isctype.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/isdigit.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/isgraph.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/islower.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/isprint.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/ispunct.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/isspace.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/isupper.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/iswalnum.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/iswctype.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/isxdigit.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/localeconv.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/mblen.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/mbstowcs.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/mbtowc.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/multibyte.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/none.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/rune.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/runetype.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/setlocale.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/setlocale.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/setrunelocale.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/table.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/toascii.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/tolower.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/tolower.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/toupper.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/toupper.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/towlower.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/towupper.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/utf8.5#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/wcstoimax.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/wcstol.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/wcstoll.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/wcstombs.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/wcstoul.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/wcstoull.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/wcstoumax.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/wctomb.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/locale/wcwidth.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/Makefile.inc#8 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/byteorder.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/gethostbyname.3#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/getipnodebyname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/getnetent.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/getprotoent.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/getprotoent.c#5 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/getservent.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/getservent.c#5 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/inet.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/inet_net.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/linkaddr.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/linkaddr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/map_v4v6.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/nscachedcli.c#5 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/nsdispatch.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/rcmd.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/rcmd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/rcmdsh.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/recv.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/resolver.3#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/sctp_sys_calls.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/send.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/powerpc/gd_qnan.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/TESTS/divrem.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/TESTS/mul.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/adddi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/anddi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/ashldi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/ashrdi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/cmpdi2.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/divdi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/fixdfdi.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/fixsfdi.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/fixunsdfdi.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/fixunssfdi.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/floatdidf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/floatdisf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/floatunsdidf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/iordi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/lshldi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/lshrdi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/moddi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/muldi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/negdi2.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/notdi2.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/qdivrem.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/quad.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/subdi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/ucmpdi2.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/udivdi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/umoddi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/quad/xordi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/regex/cname.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/regex/engine.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/regex/regcomp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/regex/regerror.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/regex/regex.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/regex/regex2.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/regex/regexec.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/regex/regfree.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/regex/utils.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/resolv/herror.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/resolv/mtctxres.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/resolv/res_comp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/resolv/res_debug.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/resolv/res_init.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/resolv/res_mkquery.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/resolv/res_query.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/resolv/res_send.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/rpc/getnetconfig.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/rpc/getnetpath.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/SYS.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/fpu/fpu.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/fpu/fpu_add.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/fpu/fpu_arith.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/fpu/fpu_compare.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/fpu/fpu_div.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/fpu/fpu_emu.h#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/fpu/fpu_explode.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/fpu/fpu_implode.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/fpu/fpu_mul.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/fpu/fpu_sqrt.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/fpu/fpu_subr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/gd_qnan.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/gen/_setjmp.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/gen/fixunsdfsi.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/gen/modf.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/gen/setjmp.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/sys/brk.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/sys/cerror.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/sys/exect.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/sys/pipe.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/sys/ptrace.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/sys/sbrk.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sparc64/sys/setlogin.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/_flock_stub.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/clrerr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fclose.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fclose.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fdopen.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/feof.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/ferror.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/ferror.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fflush.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fflush.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fgetc.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fgetln.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fgetln.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fgetpos.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fgets.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fgets.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fgetwln.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fgetws.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fileno.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/findfp.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/flags.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/floatio.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fopen.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fopen.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fprintf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fpurge.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fputc.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fputs.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fputs.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fputws.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fread.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fread.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/freopen.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fscanf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fseek.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fseek.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fsetpos.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/ftell.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/funopen.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/funopen.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fvwrite.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fvwrite.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fwalk.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/fwrite.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/getc.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/getc.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/getchar.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/gets.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/getw.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/getwc.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/glue.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/local.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/makebuf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/mktemp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/mktemp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/perror.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/printf.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/printf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/putc.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/putc.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/putchar.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/puts.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/putw.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/putwc.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/refill.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/remove.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/remove.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/rewind.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/rget.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/scanf.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/scanf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/setbuf.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/setbuf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/setbuffer.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/setvbuf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/snprintf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/sprintf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/sscanf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/stdio.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/stdio.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/tempnam.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/tmpfile.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/tmpnam.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/tmpnam.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/ungetc.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/ungetc.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/ungetwc.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/vfprintf.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/vfscanf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/vfwprintf.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/vfwscanf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/vprintf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/vscanf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/vsnprintf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/vsprintf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/vsscanf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/vswscanf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/wbuf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/wprintf.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/wscanf.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdio/wsetup.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/abort.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/abort.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/abs.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/abs.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/alloca.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/atexit.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/atexit.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/atexit.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/atof.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/atof.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/atoi.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/atoi.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/atol.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/atol.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/atoll.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/bsearch.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/bsearch.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/div.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/div.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/exit.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/exit.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/getenv.3#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/getenv.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/getopt.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/getopt.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/getsubopt.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/getsubopt.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/heapsort.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/labs.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/labs.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/ldiv.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/ldiv.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/malloc.c#7 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/memory.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/merge.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/putenv.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/qsort.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/qsort.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/radixsort.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/radixsort.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/rand.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/rand.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/random.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/random.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/realpath.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/setenv.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/strtod.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/strtoimax.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/strtol.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/strtol.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/strtoll.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/strtoq.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/strtoul.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/strtoul.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/strtoull.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/strtoumax.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/strtouq.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/system.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/system.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdtime/ctime.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdtime/localtime.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdtime/strftime.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/bcmp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/bcmp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/bcopy.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/bcopy.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/bstring.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/bzero.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/ffs.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/ffs.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/ffsl.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/fls.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/flsl.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/index.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/index.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/memccpy.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/memccpy.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/memchr.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/memchr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/memcmp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/memcmp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/memcpy.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/memmove.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/memset.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/memset.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/rindex.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strcasecmp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strcasecmp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strcasestr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strcat.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strcat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strchr.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strcmp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strcmp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strcoll.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strcpy.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strcpy.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strcspn.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strdup.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strdup.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strerror.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strerror.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/string.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strlen.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strlen.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strmode.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strmode.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strncat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strncmp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strncpy.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strnstr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strpbrk.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strpbrk.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strsep.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strsep.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strsignal.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strspn.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strstr.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strstr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strxfrm.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/swab.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/swab.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/wcscmp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/wcscoll.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/wcsncmp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/wcsncpy.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/wcsstr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/wcswidth.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/wcsxfrm.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/wmemchr.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/__error.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/_exit.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/accept.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/access.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/acct.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/adjtime.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/bind.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/brk.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/chdir.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/chflags.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/chmod.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/chown.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/chroot.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/clock_gettime.2#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/close.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/connect.2#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/dup.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/execve.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/fcntl.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/flock.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/fork.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/fsync.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/ftruncate.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/getdirentries.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/getdtablesize.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/getfh.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/getfsstat.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/getgid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/getgroups.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/getitimer.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/getlogin.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/getpeername.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/getpgrp.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/getpid.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/getpriority.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/getrlimit.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/getrusage.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/getsockname.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/getsockopt.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/gettimeofday.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/getuid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/intro.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/ioctl.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/issetugid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/kill.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/kse.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/ktrace.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/link.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/listen.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/lseek.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/lseek.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/madvise.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/mincore.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/minherit.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/mkdir.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/mkfifo.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/mknod.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/mlock.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/mmap.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/mmap.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/mount.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/mprotect.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/msync.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/munmap.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/nanosleep.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/nfssvc.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/open.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/pathconf.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/pipe.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/pread.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/profil.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/pwrite.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/quotactl.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/read.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/readlink.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/reboot.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/recv.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/rename.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/revoke.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/rmdir.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/select.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/send.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/setgroups.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/setpgid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/setregid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/setreuid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/setsid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/setuid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/shutdown.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/sigaction.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/sigaltstack.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/sigpending.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/sigprocmask.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/sigreturn.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/sigstack.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/sigsuspend.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/socket.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/socketpair.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/stat.2#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/statfs.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/swapon.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/symlink.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/sync.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/sysarch.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/syscall.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/truncate.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/truncate.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/umask.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/undelete.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/unlink.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/utimes.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/vfork.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/wait.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/write.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libutil/login.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libutil/login_tty.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libutil/logout.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libutil/logwtmp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libutil/pty.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libutil/pw_util.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libutil/uucplock.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.cpu.mk#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/tools/regression/lib/libc/stdio/test-scanfloat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/apply/apply.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/biff/biff.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/bsdiff/bsdiff/bsdiff.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/bsdiff/bspatch/bspatch.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/calendar/calendars/calendar.birthday#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/calendar/calendars/calendar.christian#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/calendar/calendars/calendar.freebsd#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/calendar/calendars/calendar.history#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/calendar/calendars/calendar.holiday#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/calendar/calendars/calendar.judaic#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/calendar/calendars/calendar.music#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/cmp/cmp.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/column/column.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/enigma/enigma.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/find/find.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/fold/fold.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/from/from.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/getconf/getconf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/head/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/head/head.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/hexdump/od.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/id/groups.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/id/id.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/join/join.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/jot/jot.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/kdump/kdump.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/kdump/kdump_subr.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/kdump/mksubr#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/lockf/lockf.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/login/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/login/login.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/login/login.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/logname/logname.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/make/make.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/mkfifo/mkfifo.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/ncplist/ncplist.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/ncplogin/ncplogin.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/ncplogin/ncplogout.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/netstat/bpf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/netstat/ipsec.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/netstat/pfkey.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/netstat/route.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/nfsstat/nfsstat.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/nl/nl.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/nslookup/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/nsupdate/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/pkill/pkill.1#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/printenv/printenv.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/setchannel/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/setchannel/setchannel.1#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/setchannel/setchannel.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/systat/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/systat/convtbl.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/systat/convtbl.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/systat/ifcmds.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/systat/ifstat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/systat/iostat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/systat/netstat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/systat/pigs.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/systat/swap.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/systat/vmstat.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/tail/tail.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/tar/COPYING#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/tar/bsdtar.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/tar/bsdtar.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/tar/bsdtar.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/tar/bsdtar_platform.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/tar/matching.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/tar/read.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/tar/tree.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/tar/tree.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/tar/util.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/tar/write.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/tcopy/tcopy.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/top/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/top/sigdesc.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/tr/str.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/truncate/truncate.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/truss/truss.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/tsort/tsort.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/tty/tty.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/uniq/uniq.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/vis/vis.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/vmstat/vmstat.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/w/w.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/wc/wc.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/what/what.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/which/which.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/whois/whois.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/xlint/lint1/emit.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/ypwhich/ypwhich.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/Makefile#7 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/adduser/adduser.8#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/adduser/rmuser.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/asf/asf.8#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/asf/asf.c#5 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bluetooth/bthidd/parser.y#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_bridge/RSTP-MIB.txt#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/Makefile#6 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ckdist/ckdist.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/crunch/crunchgen/crunchgen.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/eeprom/eeprom.8#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/freebsd-update/freebsd-update.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/fwcontrol/fwcontrol.8#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/i4b/isdnd/isdnd.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/kbdmap/kbdmap.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mount_portalfs/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mount_portalfs/activate.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mount_portalfs/conf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mount_portalfs/mount_portalfs.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mount_portalfs/portald.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mount_portalfs/pt_exec.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mount_portalfs/pt_file.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mount_portalfs/pt_pipe.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mount_portalfs/pt_tcp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mount_portalfs/pt_tcplisten.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ndp/ndp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ngctl/Makefile#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ntp/doc/ntp.conf.5#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/ppp/fsm.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rpc.lockd/lockd_lock.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rpcbind/rpcbind.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rtadvd/rtadvd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sysinstall/devices.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sysinstall/dist.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sysinstall/index.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sysinstall/installUpgrade.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sysinstall/label.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sysinstall/menus.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/timed/timed/globals.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/vidcontrol/vidcontrol.1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/watchdogd/watchdogd.c#2 integrate Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/Makefile.inc1#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.564 2006/11/13 05:52:11 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.566 2007/01/20 07:48:09 rafan Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -453,7 +453,7 @@ cd ${.CURDIR}/${_dir}; \ ${LIB32MAKE} DESTDIR=${LIB32TMP} obj .endfor -.for _dir in lib/libncurses lib/libmagic +.for _dir in lib/ncurses/ncurses lib/libmagic cd ${.CURDIR}/${_dir}; \ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} DESTDIR= build-tools >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 23 12:17:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3CDF16A403; Tue, 23 Jan 2007 12:17:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7872416A400 for ; Tue, 23 Jan 2007 12:17:31 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 652B913C474 for ; Tue, 23 Jan 2007 12:17:31 +0000 (UTC) (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 l0NCHVkg016534 for ; Tue, 23 Jan 2007 12:17:31 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0NCHGwZ016526 for perforce@freebsd.org; Tue, 23 Jan 2007 12:17:16 GMT (envelope-from bushman@freebsd.org) Date: Tue, 23 Jan 2007 12:17:16 GMT Message-Id: <200701231217.l0NCHGwZ016526@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 113454 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jan 2007 12:17:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=113454 Change 113454 by bushman@bushman_nss_ldap_cached on 2007/01/23 12:16:28 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/Makefile.inc1#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/amd.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/defaults/rc.conf#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/mtree/BSD.include.dist#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/mtree/BSD.local.dist#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/mtree/BSD.usr.dist#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/pccard_ether#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/abi#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/accounting#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/archdep#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/atm1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/auto_linklocal#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/bluetooth#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/bootconf.sh#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/bridge#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/geli#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/hcsecd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ip6fw#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ipfilter#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ipfw#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ipnat#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/jail#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ldconfig#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/lpd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/mdconfig#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/mdconfig2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/mountcritremote#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/moused#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/natd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/netif#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/nfsclient#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/nfsserver#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/nsswitch#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/pf#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/pflog#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/pfsync#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/power_profile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/pppoed#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/quota#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/sdpd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/syscons#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/syslogd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ugidfw#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/var#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ypbind#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/yppasswdd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ypserv#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ypset#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ypupdated#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.d/ypxfrd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.firewall#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.initdiskless#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/rc.subr#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/etc/snmpd.config#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/ar.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/mqueue.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/include/unistd.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/Makefile#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/SYS.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gd_qnan.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gen/_setjmp.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gen/ldexp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gen/modf.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gen/setjmp.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/gen/sigsetjmp.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/net/Makefile.inc#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/net/htonl.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/net/htons.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/net/ntohl.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/net/ntohs.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/brk.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/cerror.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/exect.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/pipe.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/ptrace.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/reboot.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/sbrk.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/setlogin.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/sigreturn.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/amd64/sys/vfork.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/arith.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/gd_qnan.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/net/Makefile.inc#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/net/htonl.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/net/htons.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/net/ntohl.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/net/ntohs.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/sys/cerror.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/arm/sys/ptrace.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/creat.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/creat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/gethostid.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/gethostid.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/getwd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/killpg.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/killpg.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/sethostid.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/setpgrp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/setrgid.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/setruid.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/setruid.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/sigcompat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/sigpause.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/sigsetmask.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/compat-43/sigvec.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_close.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_conv.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_debug.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_delete.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_get.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_open.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_overflow.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_page.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_put.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_search.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_seq.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_split.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/bt_utils.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/btree.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/btree/extern.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/db/db.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/hash/extern.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/hash/hash.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/hash/hash.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/hash/hash_bigkey.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/hash/hash_buf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/hash/hash_func.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/hash/hash_log2.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/hash/hash_page.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/hash/ndbm.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/hash/page.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/man/btree.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/man/dbopen.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/man/hash.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/man/mpool.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/man/recno.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/mpool/mpool.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/recno/extern.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/recno/rec_close.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/recno/rec_delete.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/recno/rec_get.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/recno/rec_open.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/recno/rec_put.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/recno/rec_search.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/recno/rec_seq.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/recno/rec_utils.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/recno/recno.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/test/btree.tests/main.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/test/dbtest.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/test/hash.tests/driver2.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/test/hash.tests/tcreat3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/test/hash.tests/tdel.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/test/hash.tests/thash4.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/test/hash.tests/tread2.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/test/hash.tests/tseq.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/db/test/hash.tests/tverify.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gdtoa/_hdtoa.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/__xuname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/_spinlock_stub.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/alarm.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/alarm.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/assert.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/clock.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/clock.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/closedir.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/confstr.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/confstr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/crypt.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/ctermid.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/ctermid.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/daemon.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/daemon.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/devname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/devname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/directory.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/disklabel.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/err.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/err.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/errlst.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/exec.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/exec.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/fnmatch.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/fnmatch.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/frexp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/fstab.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/fts.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/fts.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getbootfile.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getbootfile.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getbsize.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getbsize.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getcap.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getcap.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getcwd.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getcwd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getdiskbyname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getdomainname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getdomainname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getfsent.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getgrent.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getgrent.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getgrouplist.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getgrouplist.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/gethostname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/gethostname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getloadavg.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getloadavg.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getlogin.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getmntinfo.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getmntinfo.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getnetgrent.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getnetgrent.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getosreldate.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getpagesize.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getpagesize.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getpass.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getpwent.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getpwent.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getttyent.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getttyent.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getusershell.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getusershell.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getvfsbyname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/getvfsbyname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/glob.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/glob.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/initgroups.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/initgroups.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/isatty.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/ldexp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/modf.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/nice.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/nice.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/nlist.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/nlist.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/opendir.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/pause.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/pause.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/popen.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/popen.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/psignal.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/psignal.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/pw_scan.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/pw_scan.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/pwcache.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/pwcache.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/raise.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/raise.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/readdir.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/rewinddir.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/scandir.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/scandir.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/seekdir.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/setdomainname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sethostname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/setjmp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/setjmperr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/setmode.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/setmode.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/siginterrupt.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/siginterrupt.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/siglist.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/signal.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/signal.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sigsetops.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sigsetops.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sleep.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sleep.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/stringlist.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/strtofflags.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/strtofflags.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sysconf.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sysconf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sysctl.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/sysctl.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/syslog.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/syslog.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/tcgetpgrp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/tcsendbreak.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/tcsetattr.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/tcsetpgrp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/telldir.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/termios.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/time.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/time.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/times.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/times.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/timezone.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/timezone.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/ttyname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/ttyname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/ttyslot.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/tzset.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/ualarm.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/ualarm.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/uname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/uname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/unvis.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/unvis.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/usleep.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/usleep.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/utime.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/utime.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/valloc.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/valloc.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/vis.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/vis.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/wait.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/wait3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gen/waitpid.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gmon/gmon.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gmon/mcount.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/gmon/moncontrol.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/SYS.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/gd_qnan.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/gen/_setjmp.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/gen/fabs.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/gen/ldexp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/gen/modf.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/gen/setjmp.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/gen/sigsetjmp.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/net/Makefile.inc#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/net/htonl.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/net/htons.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/net/ntohl.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/net/ntohs.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/stdlib/abs.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/stdlib/div.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/stdlib/labs.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/string/bcopy.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/sys/Ovfork.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/sys/brk.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/sys/cerror.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/sys/exect.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/sys/i386_get_ldt.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/sys/pipe.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/sys/ptrace.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/sys/reboot.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/sys/sbrk.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/sys/setlogin.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/sys/sigreturn.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/i386/sys/syscall.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/ia64/gd_qnan.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/ia64/net/Makefile.inc#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/ia64/net/byte_swap_2.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/ia64/net/byte_swap_4.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/ia64/net/htonl.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/ia64/net/htons.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/ia64/net/ntohl.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/ia64/net/ntohs.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/include/libc_private.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/include/nscache.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/include/nscachedcli.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/include/spinlock.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/inet/inet_addr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/inet/inet_lnaof.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/inet/inet_makeaddr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/inet/inet_net_ntop.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/inet/inet_netof.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/inet/inet_network.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/inet/inet_ntoa.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/isc/eventlib_p.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/ctype.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/digittoint.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/euc.5#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/gbk.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/isalnum.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/isalpha.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/isascii.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/isblank.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/iscntrl.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/isctype.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/isdigit.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/isgraph.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/islower.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/isprint.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/ispunct.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/isspace.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/isupper.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/iswalnum.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/iswctype.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/isxdigit.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/localeconv.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/mblen.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/mbstowcs.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/mbtowc.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/multibyte.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/none.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/rune.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/runetype.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/setlocale.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/setlocale.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/setrunelocale.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/table.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/toascii.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/tolower.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/tolower.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/toupper.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/toupper.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/towlower.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/towupper.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/utf8.5#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/wcstoimax.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/wcstol.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/wcstoll.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/wcstombs.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/wcstoul.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/wcstoull.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/wcstoumax.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/wctomb.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/locale/wcwidth.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/Makefile.inc#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/byteorder.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/getaddrinfo.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/gethostbyname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/gethostnamadr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/getipnodebyname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/getnetent.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/getnetnamadr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/getprotoent.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/getprotoent.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/getservent.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/getservent.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/inet.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/inet_net.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/linkaddr.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/linkaddr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/map_v4v6.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/nscache.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/nscachedcli.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/nsdispatch.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/nsdispatch.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/ntoh.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/rcmd.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/rcmd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/rcmdsh.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/recv.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/resolver.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/sctp_sys_calls.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/net/send.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/powerpc/gd_qnan.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/powerpc/net/Makefile.inc#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/powerpc/net/htonl.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/powerpc/net/htons.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/powerpc/net/ntohl.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/powerpc/net/ntohs.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/TESTS/divrem.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/TESTS/mul.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/adddi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/anddi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/ashldi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/ashrdi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/cmpdi2.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/divdi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/fixdfdi.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/fixsfdi.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/fixunsdfdi.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/fixunssfdi.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/floatdidf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/floatdisf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/floatunsdidf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/iordi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/lshldi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/lshrdi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/moddi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/muldi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/negdi2.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/notdi2.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/qdivrem.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/quad.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/subdi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/ucmpdi2.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/udivdi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/umoddi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/quad/xordi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/regex/cname.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/regex/engine.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/regex/regcomp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/regex/regerror.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/regex/regex.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/regex/regex2.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/regex/regexec.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/regex/regfree.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/regex/utils.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/resolv/herror.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/resolv/mtctxres.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/resolv/res_comp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/resolv/res_debug.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/resolv/res_init.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/resolv/res_mkquery.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/resolv/res_query.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/resolv/res_send.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/rpc/getnetconfig.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/rpc/getnetpath.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/rpc/getrpcent.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/SYS.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/fpu/fpu.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/fpu/fpu_add.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/fpu/fpu_arith.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/fpu/fpu_compare.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/fpu/fpu_div.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/fpu/fpu_emu.h#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/fpu/fpu_explode.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/fpu/fpu_implode.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/fpu/fpu_mul.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/fpu/fpu_sqrt.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/fpu/fpu_subr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/gd_qnan.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/gen/_setjmp.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/gen/fixunsdfsi.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/gen/modf.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/gen/setjmp.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/net/Makefile.inc#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/net/htonl.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/net/htons.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/net/ntohl.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/net/ntohs.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/sys/Makefile.inc#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/sys/__sparc_utrap_gen.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/sys/brk.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/sys/cerror.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/sys/exect.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/sys/pipe.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/sys/ptrace.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/sys/sbrk.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sparc64/sys/setlogin.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/_flock_stub.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/clrerr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fclose.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fclose.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fdopen.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/feof.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/ferror.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/ferror.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fflush.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fflush.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fgetc.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fgetln.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fgetln.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fgetpos.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fgets.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fgets.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fgetwln.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fgetws.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fileno.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/findfp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/flags.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/floatio.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fopen.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fopen.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fprintf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fpurge.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fputc.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fputs.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fputs.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fputws.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fread.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fread.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/freopen.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fscanf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fseek.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fseek.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fsetpos.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/ftell.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/funopen.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/funopen.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fvwrite.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fvwrite.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fwalk.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/fwrite.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/getc.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/getc.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/getchar.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/gets.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/getw.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/getwc.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/glue.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/local.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/makebuf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/mktemp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/mktemp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/perror.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/printf.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/printf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/putc.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/putc.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/putchar.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/puts.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/putw.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/putwc.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/refill.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/remove.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/remove.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/rewind.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/rget.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/scanf.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/scanf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/setbuf.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/setbuf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/setbuffer.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/setvbuf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/snprintf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/sprintf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/sscanf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/stdio.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/stdio.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/tempnam.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/tmpfile.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/tmpnam.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/tmpnam.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/ungetc.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/ungetc.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/ungetwc.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/vfprintf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/vfscanf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/vfwprintf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/vfwscanf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/vprintf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/vscanf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/vsnprintf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/vsprintf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/vsscanf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/vswscanf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/wbuf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/wprintf.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/wscanf.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdio/wsetup.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/abort.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/abort.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/abs.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/abs.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/alloca.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/atexit.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/atexit.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/atexit.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/atof.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/atof.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/atoi.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/atoi.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/atol.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/atol.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/atoll.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/bsearch.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/bsearch.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/div.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/div.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/exit.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/exit.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/getenv.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/getenv.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/getopt.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/getopt.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/getsubopt.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/getsubopt.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/heapsort.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/labs.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/labs.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/ldiv.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/ldiv.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/memory.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/merge.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/putenv.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/qsort.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/qsort.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/radixsort.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/radixsort.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/rand.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/rand.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/random.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/random.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/realpath.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/setenv.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/strtod.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/strtoimax.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/strtol.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/strtol.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/strtoll.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/strtoq.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/strtoul.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/strtoul.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/strtoull.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/strtoumax.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/strtouq.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/system.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdlib/system.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdtime/ctime.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdtime/localtime.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/stdtime/strftime.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/bcmp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/bcmp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/bcopy.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/bcopy.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/bstring.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/bzero.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/ffs.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/ffs.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/ffsl.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/fls.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/flsl.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/index.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/index.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/memccpy.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/memccpy.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/memchr.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/memchr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/memcmp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/memcmp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/memcpy.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/memmove.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/memset.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/memset.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/rindex.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strcasecmp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strcasecmp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strcasestr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strcat.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strcat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strchr.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strcmp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strcmp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strcoll.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strcpy.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strcpy.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strcspn.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strdup.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strdup.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strerror.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strerror.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/string.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strlen.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strlen.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strmode.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strmode.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strncat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strncmp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strncpy.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strnstr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strpbrk.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strpbrk.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strsep.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strsep.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strsignal.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strspn.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strstr.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strstr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/strxfrm.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/swab.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/swab.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/wcscmp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/wcscoll.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/wcsncmp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/wcsncpy.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/wcsstr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/wcswidth.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/wcsxfrm.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/string/wmemchr.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/__error.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/_exit.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/accept.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/access.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/acct.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/adjtime.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/bind.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/brk.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/chdir.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/chflags.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/chmod.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/chown.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/chroot.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/clock_gettime.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/close.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/connect.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/dup.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/execve.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/extattr_get_file.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/fcntl.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/flock.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/fork.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/fsync.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/ftruncate.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/getdirentries.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/getdtablesize.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/getfh.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/getfsstat.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/getgid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/getgroups.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/getitimer.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/getlogin.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/getpeername.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/getpgrp.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/getpid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/getpriority.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/getrlimit.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/getrusage.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/getsockname.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/getsockopt.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/gettimeofday.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/getuid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/intro.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/ioctl.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/issetugid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/kill.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/kqueue.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/kse.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/ktrace.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/link.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/listen.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/lseek.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/lseek.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/madvise.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/mincore.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/minherit.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/mkdir.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/mkfifo.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/mknod.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/mlock.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/mmap.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/mmap.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/mount.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/mprotect.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/msync.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/munmap.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/nanosleep.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/nfssvc.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/open.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/pathconf.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/pipe.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/pread.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/profil.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/ptrace.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/pwrite.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/quotactl.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/read.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/readlink.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/reboot.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/recv.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/rename.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/revoke.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/rmdir.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/select.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/send.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/sendfile.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/setgroups.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/setpgid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/setregid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/setreuid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/setsid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/setuid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/shutdown.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/sigaction.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/sigaltstack.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/sigpending.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/sigprocmask.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/sigreturn.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/sigstack.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/sigsuspend.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/socket.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/socketpair.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/stat.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/statfs.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/swapon.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/symlink.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/sync.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/sysarch.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/syscall.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/truncate.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/truncate.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/umask.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/undelete.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/unlink.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/utimes.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/vfork.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/wait.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libc/sys/write.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libnssutil/Makefile#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/login.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/login_ok.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/login_tty.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/logout.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/logwtmp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/pty.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/pw_util.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/libutil/uucplock.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/nss_compat/Makefile#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/nss_compat/compat_serv.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/nss_compat/compat_serv.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/nss_compat/nss_compat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/nss_files/files_serv.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/nss_files/files_serv.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/lib/nss_files/nss_files.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/share/mk/bsd.cpu.mk#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/share/mk/bsd.endian.mk#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/share/mk/bsd.own.mk#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/share/mk/bsd.port.mk#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/share/mk/bsd.sys.mk#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/tools/regression/lib/libc/stdio/test-scanfloat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/alias/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/alias/generic.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/apply/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/apply/apply.1#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/apply/apply.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/asa/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/asa/asa.1#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/asa/asa.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/at/LEGAL#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/at/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/at/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/at/at.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/at/at.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/at/at.man#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/at/panic.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/at/panic.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/at/parsetime.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/at/parsetime.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/at/perm.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/at/perm.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/at/privs.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/atm/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/atm/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/atm/sscop/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/awk/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/awk/b.c.diff#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/awk/lib.c.diff#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/awk/main.c.diff#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/awk/run.c.diff#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/awk/tran.c.diff#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/banner/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/banner/banner.6#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/banner/banner.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/basename/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/basename/basename.1#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/basename/basename.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/biff/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/biff/biff.1#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/biff/biff.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/bluetooth/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/bluetooth/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/bluetooth/bthost/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/bluetooth/bthost/bthost.1#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/bluetooth/bthost/bthost.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/bluetooth/btsockstat/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/bluetooth/btsockstat/btsockstat.1#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/bluetooth/btsockstat/btsockstat.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/bluetooth/rfcomm_sppd/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/brandelf/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/brandelf/brandelf.1#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/brandelf/brandelf.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/bsdiff/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/bsdiff/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/bsdiff/bsdiff/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/bsdiff/bsdiff/bsdiff.1#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/bsdiff/bsdiff/bsdiff.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/bsdiff/bspatch/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/bsdiff/bspatch/bspatch.1#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/bsdiff/bspatch/bspatch.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/bzip2/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/bzip2/doc/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/bzip2recover/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/c89/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/c89/c89.1#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/c89/c89.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/c99/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/c99/c99.1#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/c99/c99.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/calendar/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/calendar/calendar.1#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/calendar/calendar.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/calendar/calendar.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/calendar/calendars/calendar.all#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/calendar/calendars/calendar.australia#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/calendar/calendars/calendar.birthday#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/calendar/calendars/calendar.christian#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/calendar/calendars/calendar.computer#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/calendar/calendars/calendar.croatian#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/calendar/calendars/calendar.freebsd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/calendar/calendars/calendar.french#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/calendar/calendars/calendar.german#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/calendar/calendars/calendar.history#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/calendar/calendars/calendar.holiday#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/calendar/calendars/calendar.hungarian#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/calendar/calendars/calendar.judaic#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/calendar/calendars/calendar.lotr#1 branch .. //depot/projects/soc2006/nss_ldap_cached_no_nss_ldap/src/usr.bin/calendar/calendars/calendar.music#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 23 13:37:25 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2324116A405; Tue, 23 Jan 2007 13:37:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D5F5116A402 for ; Tue, 23 Jan 2007 13:37:24 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C268E13C428 for ; Tue, 23 Jan 2007 13:37:24 +0000 (UTC) (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 l0NDbOdv041046 for ; Tue, 23 Jan 2007 13:37:24 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0NDbAGu041043 for perforce@freebsd.org; Tue, 23 Jan 2007 13:37:10 GMT (envelope-from bushman@freebsd.org) Date: Tue, 23 Jan 2007 13:37:10 GMT Message-Id: <200701231337.l0NDbAGu041043@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 113457 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jan 2007 13:37:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=113457 Change 113457 by bushman@bushman_nss_ldap_cached on 2007/01/23 13:36:18 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/Makefile.inc1#5 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/amd.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/defaults/rc.conf#7 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mtree/BSD.include.dist#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mtree/BSD.local.dist#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mtree/BSD.usr.dist#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/network.subr#5 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pccard_ether#5 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pf.os#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/abi#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/accounting#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/archdep#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/atm1#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/auto_linklocal#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/bluetooth#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/bootconf.sh#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/bridge#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/geli#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/hcsecd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ip6fw#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ipfilter#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ipfw#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ipnat#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/jail#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ldconfig#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/lpd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/mdconfig#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/mdconfig2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/mountcritremote#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/moused#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/natd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/netif#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/nfsclient#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/nfsserver#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/nsswitch#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/pf#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/pflog#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/pfsync#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/power_profile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ppp#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/pppoed#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/quota#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/sdpd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/syscons#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/syslogd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ugidfw#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/var#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ypbind#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/yppasswdd#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ypserv#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ypset#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ypupdated#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ypxfrd#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.firewall#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.initdiskless#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.subr#6 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/snmpd.config#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/Makefile#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/ar.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/arpa/nameser_compat.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/mqueue.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/unistd.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/Makefile#6 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/SYS.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gd_qnan.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gen/_setjmp.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gen/ldexp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gen/modf.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gen/setjmp.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gen/sigsetjmp.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/net/Makefile.inc#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/net/htonl.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/net/htons.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/net/ntohl.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/net/ntohs.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/brk.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/cerror.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/exect.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/pipe.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/ptrace.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/reboot.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/sbrk.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/setlogin.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/sigreturn.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/vfork.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/arith.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/gd_qnan.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/net/Makefile.inc#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/net/htonl.S#3 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/net/htons.S#3 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/net/ntohl.S#3 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/net/ntohs.S#3 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/sys/cerror.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/sys/ptrace.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/creat.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/creat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/gethostid.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/gethostid.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/getwd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/killpg.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/killpg.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/sethostid.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/setpgrp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/setrgid.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/setruid.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/setruid.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/sigcompat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/sigpause.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/sigsetmask.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/sigvec.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_close.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_conv.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_debug.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_delete.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_get.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_open.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_overflow.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_page.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_put.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_search.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_seq.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_split.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_utils.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/btree.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/extern.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/db/db.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/hash/extern.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/hash/hash.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/hash/hash.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/hash/hash_bigkey.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/hash/hash_buf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/hash/hash_func.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/hash/hash_log2.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/hash/hash_page.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/hash/ndbm.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/hash/page.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/man/btree.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/man/dbopen.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/man/hash.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/man/mpool.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/man/recno.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/mpool/mpool.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/recno/extern.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/recno/rec_close.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/recno/rec_delete.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/recno/rec_get.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/recno/rec_open.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/recno/rec_put.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/recno/rec_search.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/recno/rec_seq.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/recno/rec_utils.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/recno/recno.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/test/btree.tests/main.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/test/dbtest.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/test/hash.tests/driver2.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/test/hash.tests/tcreat3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/test/hash.tests/tdel.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/test/hash.tests/thash4.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/test/hash.tests/tread2.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/test/hash.tests/tseq.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/test/hash.tests/tverify.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gdtoa/_hdtoa.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/Symbol.map#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/__xuname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/_spinlock_stub.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/alarm.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/alarm.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/assert.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/clock.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/clock.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/closedir.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/confstr.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/confstr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/crypt.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/ctermid.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/ctermid.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/daemon.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/daemon.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/devname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/devname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/directory.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/disklabel.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/err.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/err.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/errlst.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/exec.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/exec.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/fnmatch.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/fnmatch.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/frexp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/fstab.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/fts.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/fts.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getbootfile.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getbootfile.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getbsize.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getbsize.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getcap.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getcap.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getcwd.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getcwd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getdiskbyname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getdomainname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getdomainname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getfsent.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getgrent.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getgrent.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getgrouplist.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getgrouplist.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/gethostname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/gethostname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getloadavg.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getloadavg.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getlogin.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getmntinfo.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getmntinfo.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getnetgrent.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getnetgrent.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getosreldate.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getpagesize.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getpagesize.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getpass.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getpwent.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getpwent.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getttyent.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getttyent.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getusershell.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getusershell.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getvfsbyname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getvfsbyname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/glob.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/glob.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/initgroups.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/initgroups.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/isatty.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/ldexp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/modf.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/nice.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/nice.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/nlist.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/nlist.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/opendir.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/pause.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/pause.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/popen.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/popen.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/psignal.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/psignal.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/pw_scan.c#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/pw_scan.h#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/pwcache.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/pwcache.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/raise.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/raise.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/readdir.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/rewinddir.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/scandir.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/scandir.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/seekdir.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/setdomainname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sethostname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/setjmp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/setjmperr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/setmode.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/setmode.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/siginterrupt.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/siginterrupt.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/siglist.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/signal.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/signal.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sigsetops.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sigsetops.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sleep.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sleep.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/stringlist.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/strtofflags.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/strtofflags.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sysconf.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sysconf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sysctl.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sysctl.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/syslog.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/syslog.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/tcgetpgrp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/tcsendbreak.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/tcsetattr.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/tcsetpgrp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/telldir.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/termios.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/time.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/time.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/times.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/times.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/timezone.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/timezone.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/ttyname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/ttyname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/ttyslot.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/tzset.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/ualarm.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/ualarm.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/uname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/uname.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/unvis.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/unvis.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/usleep.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/usleep.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/utime.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/utime.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/valloc.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/valloc.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/vis.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/vis.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/wait.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/wait3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/waitpid.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gmon/Makefile.inc#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gmon/gmon.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gmon/mcount.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gmon/moncontrol.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/SYS.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/gd_qnan.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/gen/_setjmp.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/gen/fabs.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/gen/ldexp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/gen/modf.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/gen/setjmp.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/gen/sigsetjmp.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/net/Makefile.inc#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/net/htonl.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/net/htons.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/net/ntohl.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/net/ntohs.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/stdlib/abs.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/stdlib/div.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/stdlib/labs.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/string/bcopy.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/sys/Ovfork.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/sys/brk.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/sys/cerror.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/sys/exect.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/sys/i386_get_ldt.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/sys/pipe.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/sys/ptrace.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/sys/reboot.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/sys/sbrk.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/sys/setlogin.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/sys/sigreturn.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/i386/sys/syscall.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/ia64/gd_qnan.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/ia64/net/Makefile.inc#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/ia64/net/byte_swap_2.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/ia64/net/byte_swap_4.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/ia64/net/htonl.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/ia64/net/htons.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/ia64/net/ntohl.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/ia64/net/ntohs.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/include/libc_private.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/include/nscache.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/include/nscachedcli.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/include/spinlock.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/inet/inet_addr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/inet/inet_cidr_ntop.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/inet/inet_lnaof.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/inet/inet_makeaddr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/inet/inet_net_ntop.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/inet/inet_netof.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/inet/inet_network.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/inet/inet_ntoa.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/isc/eventlib_p.h#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/ctype.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/digittoint.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/euc.5#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/gbk.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/isalnum.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/isalpha.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/isascii.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/isblank.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/iscntrl.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/isctype.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/isdigit.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/isgraph.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/islower.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/isprint.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/ispunct.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/isspace.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/isupper.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/iswalnum.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/iswctype.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/isxdigit.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/localeconv.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/mblen.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/mbstowcs.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/mbtowc.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/multibyte.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/none.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/rune.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/runetype.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/setlocale.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/setlocale.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/setrunelocale.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/table.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/toascii.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/tolower.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/tolower.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/toupper.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/toupper.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/towlower.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/towupper.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/utf8.5#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/wcstoimax.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/wcstol.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/wcstoll.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/wcstombs.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/wcstoul.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/wcstoull.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/wcstoumax.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/wctomb.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/locale/wcwidth.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/Makefile.inc#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/byteorder.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/getaddrinfo.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/gethostbyname.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/gethostnamadr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/getipnodebyname.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/getnetent.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/getnetnamadr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/getprotoent.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/getprotoent.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/getservent.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/getservent.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/inet.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/inet_net.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/linkaddr.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/linkaddr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/map_v4v6.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/nscache.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/nscachedcli.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/nsdispatch.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/nsdispatch.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/ntoh.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/rcmd.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/rcmd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/rcmdsh.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/recv.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/resolver.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/sctp_sys_calls.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/send.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/powerpc/gd_qnan.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/powerpc/net/Makefile.inc#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/powerpc/net/htonl.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/powerpc/net/htons.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/powerpc/net/ntohl.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/powerpc/net/ntohs.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/TESTS/divrem.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/TESTS/mul.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/adddi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/anddi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/ashldi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/ashrdi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/cmpdi2.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/divdi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/fixdfdi.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/fixsfdi.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/fixunsdfdi.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/fixunssfdi.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/floatdidf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/floatdisf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/floatunsdidf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/iordi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/lshldi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/lshrdi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/moddi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/muldi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/negdi2.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/notdi2.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/qdivrem.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/quad.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/subdi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/ucmpdi2.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/udivdi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/umoddi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/quad/xordi3.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/regex/cname.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/regex/engine.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/regex/regcomp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/regex/regerror.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/regex/regex.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/regex/regex2.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/regex/regexec.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/regex/regfree.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/regex/utils.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/resolv/herror.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/resolv/mtctxres.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/resolv/res_comp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/resolv/res_debug.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/resolv/res_init.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/resolv/res_mkquery.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/resolv/res_query.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/resolv/res_send.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/rpc/getnetconfig.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/rpc/getnetpath.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/rpc/getrpcent.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/SYS.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/fpu/fpu.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/fpu/fpu_add.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/fpu/fpu_arith.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/fpu/fpu_compare.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/fpu/fpu_div.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/fpu/fpu_emu.h#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/fpu/fpu_explode.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/fpu/fpu_implode.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/fpu/fpu_mul.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/fpu/fpu_sqrt.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/fpu/fpu_subr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/gd_qnan.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/gen/_setjmp.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/gen/fixunsdfsi.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/gen/modf.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/gen/setjmp.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/net/Makefile.inc#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/net/htonl.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/net/htons.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/net/ntohl.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/net/ntohs.S#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/sys/Makefile.inc#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/sys/__sparc_utrap_gen.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/sys/brk.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/sys/cerror.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/sys/exect.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/sys/pipe.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/sys/ptrace.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/sys/sbrk.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sparc64/sys/setlogin.S#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/_flock_stub.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/clrerr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fclose.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fclose.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fdopen.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/feof.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/ferror.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/ferror.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fflush.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fflush.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fgetc.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fgetln.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fgetln.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fgetpos.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fgets.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fgets.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fgetwln.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fgetws.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fileno.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/findfp.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/flags.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/floatio.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fopen.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fopen.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fprintf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fpurge.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fputc.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fputs.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fputs.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fputws.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fread.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fread.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/freopen.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fscanf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fseek.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fseek.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fsetpos.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/ftell.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/funopen.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/funopen.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fvwrite.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fvwrite.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fwalk.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/fwrite.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/getc.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/getc.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/getchar.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/gets.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/getw.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/getwc.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/glue.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/local.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/makebuf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/mktemp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/mktemp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/perror.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/printf.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/printf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/putc.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/putc.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/putchar.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/puts.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/putw.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/putwc.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/refill.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/remove.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/remove.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/rewind.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/rget.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/scanf.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/scanf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/setbuf.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/setbuf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/setbuffer.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/setvbuf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/snprintf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/sprintf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/sscanf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/stdio.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/stdio.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/tempnam.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/tmpfile.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/tmpnam.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/tmpnam.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/ungetc.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/ungetc.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/ungetwc.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/vfprintf.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/vfscanf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/vfwprintf.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/vfwscanf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/vprintf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/vscanf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/vsnprintf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/vsprintf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/vsscanf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/vswscanf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/wbuf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/wprintf.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/wscanf.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/wsetup.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdio/xprintf.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/abort.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/abort.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/abs.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/abs.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/alloca.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/atexit.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/atexit.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/atexit.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/atof.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/atof.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/atoi.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/atoi.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/atol.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/atol.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/atoll.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/bsearch.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/bsearch.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/div.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/div.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/exit.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/exit.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/getenv.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/getenv.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/getopt.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/getopt.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/getsubopt.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/getsubopt.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/heapsort.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/labs.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/labs.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/ldiv.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/ldiv.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/malloc.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/memory.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/merge.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/putenv.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/qsort.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/qsort.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/radixsort.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/radixsort.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/rand.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/rand.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/random.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/random.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/realpath.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/setenv.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/strtod.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/strtoimax.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/strtol.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/strtol.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/strtoll.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/strtoq.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/strtoul.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/strtoul.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/strtoull.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/strtoumax.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/strtouq.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/system.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/system.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdtime/ctime.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdtime/localtime.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdtime/strftime.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/bcmp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/bcmp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/bcopy.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/bcopy.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/bstring.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/bzero.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/ffs.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/ffs.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/ffsl.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/fls.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/flsl.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/index.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/index.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/memccpy.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/memccpy.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/memchr.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/memchr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/memcmp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/memcmp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/memcpy.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/memmove.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/memset.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/memset.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/rindex.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strcasecmp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strcasecmp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strcasestr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strcat.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strcat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strchr.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strcmp.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strcmp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strcoll.3#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strcpy.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strcpy.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strcspn.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strdup.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strdup.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strerror.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strerror.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/string.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strlen.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strlen.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strmode.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strmode.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strncat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strncmp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strncpy.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strnstr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strpbrk.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strpbrk.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strsep.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strsep.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strsignal.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strspn.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strstr.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strstr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strxfrm.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/swab.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/swab.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/wcscmp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/wcscoll.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/wcsncmp.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/wcsncpy.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/wcsstr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/wcswidth.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/wcsxfrm.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/wmemchr.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/__error.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/_exit.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/accept.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/access.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/acct.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/adjtime.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/bind.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/brk.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/chdir.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/chflags.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/chmod.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/chown.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/chroot.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/clock_gettime.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/close.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/connect.2#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/dup.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/execve.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/extattr_get_file.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/fcntl.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/flock.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/fork.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/fsync.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/ftruncate.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/getdirentries.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/getdtablesize.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/getfh.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/getfsstat.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/getgid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/getgroups.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/getitimer.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/getlogin.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/getpeername.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/getpgrp.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/getpid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/getpriority.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/getrlimit.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/getrusage.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/getsockname.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/getsockopt.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/gettimeofday.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/getuid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/intro.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/ioctl.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/issetugid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/kill.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/kqueue.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/kse.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/ktrace.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/link.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/listen.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/lseek.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/lseek.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/madvise.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/mincore.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/minherit.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/mkdir.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/mkfifo.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/mknod.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/mlock.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/mmap.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/mmap.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/mount.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/mprotect.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/msync.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/munmap.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/nanosleep.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/nfssvc.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/open.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/pathconf.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/pipe.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/pread.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/profil.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/ptrace.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/pwrite.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/quotactl.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/read.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/readlink.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/reboot.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/recv.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/rename.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/revoke.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/rmdir.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/select.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/send.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/sendfile.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/setgroups.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/setpgid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/setregid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/setreuid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/setsid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/setuid.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/shutdown.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/sigaction.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/sigaltstack.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/sigpending.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/sigprocmask.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/sigreturn.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/sigstack.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/sigsuspend.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/socket.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/socketpair.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/stat.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/statfs.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/swapon.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/symlink.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/sync.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/sysarch.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/syscall.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/truncate.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/truncate.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/umask.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/undelete.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/unlink.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/utimes.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/vfork.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/wait.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/write.2#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libnssutil/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/_secure_path.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/_secure_path.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/auth.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/auth.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/auth.conf.5#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/fparseln.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/fparseln.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/humanize_number.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/humanize_number.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/kld.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/kld.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/libutil.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/login.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/login.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/login.conf.5#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/login_auth.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/login_auth.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/login_cap.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/login_cap.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/login_cap.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/login_class.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/login_class.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/login_crypt.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/login_ok.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/login_ok.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/login_times.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/login_times.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/login_tty.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/login_tty.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/logout.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/logout.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/logwtmp.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/logwtmp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/pidfile.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/pidfile.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/property.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/property.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/pty.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/pty.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/pw_util.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/realhostname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/realhostname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/realhostname_sa.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/stub.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/trimdomain.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/trimdomain.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/uucplock.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libutil/uucplock.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_compat/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_compat/compat_serv.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_compat/compat_serv.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_compat/nss_compat.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_dns/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_files/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_files/files_serv.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_files/files_serv.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_files/nss_files.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_icmp/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_icmp/icmp_hosts_namadr.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/hashtable.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldap_group.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldap_group.h#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldap_passwd.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldap_passwd.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldap_serv.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldap_serv.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldapconf.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldapconf.h#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldapconn.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldapschema.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldapschema.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldapsearch.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldapsearch.h#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldaputil.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldaputil.h#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/nss_ldap.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/nss_ldap.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_nis/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.cpu.mk#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.endian.mk#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.lib.mk#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.own.mk#5 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.port.mk#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.sys.mk#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/tools/regression/lib/libc/stdio/test-scanfloat.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/alias/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/alias/generic.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/apply/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/apply/apply.1#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/apply/apply.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/asa/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/asa/asa.1#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/asa/asa.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/at/LEGAL#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/at/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/at/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/at/at.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/at/at.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/at/at.man#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/at/panic.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/at/panic.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/at/parsetime.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/at/parsetime.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/at/perm.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.bin/at/perm.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 23 16:07:11 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A5C916A406; Tue, 23 Jan 2007 16:07:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D8F6616A403 for ; Tue, 23 Jan 2007 16:07:10 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C448B13C441 for ; Tue, 23 Jan 2007 16:07:10 +0000 (UTC) (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 l0NG7AIk069007 for ; Tue, 23 Jan 2007 16:07:10 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 l0NG7ASW068978 for perforce@freebsd.org; Tue, 23 Jan 2007 16:07:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 23 Jan 2007 16:07:10 GMT Message-Id: <200701231607.l0NG7ASW068978@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 113458 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jan 2007 16:07:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=113458 Change 113458 by rwatson@rwatson_fledge on 2007/01/23 16:04:08 Integrate zcopybpf branch for work by csjp and myself on reduced numbers of copies in high performance packet sniffing environments. Affected files ... .. //depot/projects/zcopybpf/src/contrib/libpcap/.cvsignore#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/CHANGES#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/CREDITS#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/FILES#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/FREEBSD-upgrade#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/INSTALL#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/INSTALL.txt#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/LICENSE#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/Makefile.in#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/README#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/README.Win32#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/README.aix#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/README.dag#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/README.hpux#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/README.linux#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/README.macosx#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/README.septel#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/README.tru64#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/TODO#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/VERSION#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/acconfig.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/acsite.m4#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/arcnet.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/atmuni31.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/bpf/net/bpf_filter.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/bpf_dump.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/bpf_image.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/config.guess#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/config.h.in#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/config.sub#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/configure#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/configure.in#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/doc/pcap.html#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/doc/pcap.txt#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/doc/pcap.xml#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/etherent.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/ethertype.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/fad-getad.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/fad-gifc.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/fad-glifc.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/fad-null.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/fad-win32.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/gencode.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/gencode.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/grammar.y#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/inet.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/install-sh#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/lbl/gnuc.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/lbl/os-aix4.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/lbl/os-hpux11.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/lbl/os-osf4.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/lbl/os-osf5.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/lbl/os-solaris2.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/lbl/os-sunos4.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/lbl/os-ultrix4.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/llc.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/mkdep#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/nametoaddr.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/nlpid.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/optimize.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-dag.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-dag.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-dlpi.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-dos.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-dos.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-enet.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-int.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-linux.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-namedb.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-nit.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-nit.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-null.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-pf.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-pf.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-septel.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-septel.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-snit.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-snoop.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-stdinc.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-win32.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap.3#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap1.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/pf.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/ppp.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/savefile.c#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/scanner.l#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/sll.h#1 branch .. //depot/projects/zcopybpf/src/contrib/libpcap/sunatmpos.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/.cvsignore#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/CHANGES#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/CREDITS#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/FILES#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/FREEBSD-upgrade#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/INSTALL#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/LICENSE#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/Makefile-devel-adds#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/Makefile.in#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/PLATFORMS#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/README#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/Readme.Win32#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/TODO#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/VERSION#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/acconfig.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/addrtoname.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/addrtoname.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/ah.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/aodv.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/appletalk.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/arcnet.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/atime.awk#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/atm.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/atmuni31.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/bgp.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/bootp.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/bpf_dump.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/chdlc.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/config.guess#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/config.h.in#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/config.sub#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/configure#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/configure.in#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/cpack.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/cpack.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/dccp.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/decnet.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/decode_prefix.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/enc.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/esp.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/ether.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/ethertype.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/extract.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/fddi.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/gmpls.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/gmpls.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/gmt2local.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/gmt2local.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/icmp6.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/ieee802_11.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/ieee802_11_radio.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/igrp.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/install-sh#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/interface.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/ip.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/ip6.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/ipfc.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/ipproto.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/ipproto.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/ipsec_doi.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/ipx.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/isakmp.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/l2tp.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/l2vpn.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/l2vpn.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/lane.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/lbl/os-osf4.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/lbl/os-solaris2.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/lbl/os-sunos4.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/lbl/os-ultrix4.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/llc.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/machdep.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/machdep.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/makemib#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/mib.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/missing/addrinfo.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/missing/addrsize.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/missing/bittypes.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/missing/datalinks.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/missing/dlnames.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/missing/getaddrinfo.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/missing/getnameinfo.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/missing/inet_aton.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/missing/inet_ntop.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/missing/inet_pton.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/missing/resolv6.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/missing/resolv_ext.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/missing/snprintf.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/missing/sockstorage.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/missing/strdup.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/missing/strlcat.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/missing/strlcpy.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/missing/strsep.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/mkdep#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/mpls.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/nameser.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/netbios.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/netdissect.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/nfs.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/nfsfh.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/nlpid.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/nlpid.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/ntp.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/oakley.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/ospf.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/ospf6.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/oui.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/oui.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/packetdat.awk#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/parsenfsfh.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/pcap-missing.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/pcap_dump_ftell.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/pf.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/pmap_prot.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/ppp.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-802_11.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ah.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-aodv.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ap1394.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-arcnet.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-arp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ascii.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-atalk.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-atm.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-beep.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-bfd.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-bgp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-bootp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-cdp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-chdlc.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-cip.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-cnfp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-dccp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-decnet.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-dhcp6.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-domain.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-dvmrp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-eap.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-egp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-eigrp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-enc.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-esp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ether.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-fddi.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-fr.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-frag6.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-gre.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-hsrp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-icmp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-icmp6.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-igmp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-igrp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ip.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ip6.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ip6opts.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ipcomp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ipfc.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ipx.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-isakmp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-isoclns.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-juniper.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-krb.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-l2tp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-lane.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ldp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-llc.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-lmp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-lspping.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-lwres.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-mobile.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-mobility.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-mpls.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-msdp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-netbios.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-nfs.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ntp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-null.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ospf.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ospf6.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-pflog.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-pgm.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-pim.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ppp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-pppoe.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-pptp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-radius.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-raw.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-rip.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ripng.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-rsvp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-rt6.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-rx.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-sctp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-sip.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-sl.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-sll.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-slow.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-smb.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-snmp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-stp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-sunatm.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-sunrpc.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-symantec.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-syslog.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-tcp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-telnet.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-tftp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-timed.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-token.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-udp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-vjc.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-vrrp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-wb.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/print-zephyr.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/route6d.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/rpc_auth.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/rpc_msg.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/rx.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/sctpConstants.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/sctpHeader.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/send-ack.awk#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/setsignal.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/setsignal.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/slcompress.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/slip.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/sll.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/smb.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/smbutil.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/stime.awk#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/strcasecmp.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tcp.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tcpdump-stdinc.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tcpdump.1#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tcpdump.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/telnet.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/.cvsignore#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/02-sunrise-sunset-esp.puu#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/08-sunrise-sunset-aes.puu#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/08-sunrise-sunset-esp2.puu#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/alltests.sh#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/bgp_vpn_attrset.out#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/bgp_vpn_attrset.sh#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/eapon1.gdbinit#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/eapon1.out#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/eapon1.puu#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/eapon1.sh#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/eapon2.puu#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/esp-secrets.txt#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/esp0.out#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/esp0.sh#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/esp1.gdbinit#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/esp1.out#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/esp1.sh#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/esp2.gdbinit#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/esp2.out#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/esp2.sh#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/esp3.gdbinit#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/esp3.sh#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/esp4.gdbinit#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/esp4.sh#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/esp5.gdbinit#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/esp5.out#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/esp5.sh#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/espudp1.out#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/espudp1.puu#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/espudp1.sh#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/isakmp-delete-segfault.puu#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/isakmp-identification-segfault.puu#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/isakmp-pointer-loop.puu#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/isakmp1.out#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/isakmp1.sh#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/isakmp2.out#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/isakmp2.sh#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/isakmp3.out#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/isakmp3.sh#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/isakmp4.out#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/isakmp4.sh#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/isakmp4500.puu#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/lmp.out#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/lmp.puu#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/lmp.sh#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/mpls-ldp-hello.out#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/mpls-ldp-hello.puu#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/mpls-ldp-hello.sh#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/ospf-gmpls.out#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/ospf-gmpls.puu#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/ospf-gmpls.sh#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/print-A.out#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/print-AA.out#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/print-X.out#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/print-XX.out#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/print-capX.out#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/print-capXX.out#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/print-flags.puu#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/print-flags.sh#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/print-x.out#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/print-xx.out#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/timed.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/token.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/udp.h#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/util.c#1 branch .. //depot/projects/zcopybpf/src/contrib/tcpdump/vfprintf.c#1 branch .. //depot/projects/zcopybpf/src/lib/libpcap/Makefile#1 branch .. //depot/projects/zcopybpf/src/lib/libpcap/config.h#1 branch .. //depot/projects/zcopybpf/src/sys/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/bios.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/io.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/msi.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/support.S#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/conf/.cvsignore#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/conf/MAC#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/conf/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/conf/NOTES#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/_bus.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/_limits.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/_types.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/asm.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/atomic.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/bus.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/clock.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/cpu.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/elf.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/endian.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/exec.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/float.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/fpu.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/frame.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/iodev.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/kdb.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/limits.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/md_var.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/memdev.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/metadata.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/minidump.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/mptable.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/mutex.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/param.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/pc/bios.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/pcb.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/pmap.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/proc.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/profile.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/psl.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/reg.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/reloc.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/resource.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/runq.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/segments.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/signal.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/smp.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/trap.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/tss.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/varargs.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/isa/clock.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/isa/icu.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/isa/isa.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/isa/isa.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/blockio.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/copystr.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/disassem.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/exception.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/fiq.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/fusu.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/genassym.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/inckern.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/intr.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/locore.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/mem.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/nexus.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/nexus_io.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/pmap.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/setstack.s#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/support.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/swtch.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/trap.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/undefined.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/vectors.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/at91.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_mci.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_piovar.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/at91var.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/files.at91#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/std.at91#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/zcopybpf/src/sys/arm/conf/.cvsignore#1 branch .. //depot/projects/zcopybpf/src/sys/arm/conf/AVILA#1 branch .. //depot/projects/zcopybpf/src/sys/arm/conf/BWCT#1 branch .. //depot/projects/zcopybpf/src/sys/arm/conf/BWCT.hints#1 branch .. //depot/projects/zcopybpf/src/sys/arm/conf/EP80219#1 branch .. //depot/projects/zcopybpf/src/sys/arm/conf/IQ31244#1 branch .. //depot/projects/zcopybpf/src/sys/arm/conf/KB920X#1 branch .. //depot/projects/zcopybpf/src/sys/arm/conf/SIMICS#1 branch .. //depot/projects/zcopybpf/src/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/_bus.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/_limits.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/_stdint.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/_types.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/armreg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/asm.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/asmacros.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/atomic.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/blockio.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/bus.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/clock.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/cpu.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/disassem.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/elf.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/endian.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/exec.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/fiq.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/float.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/fp.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/frame.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/ieee.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/intr.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/katelib.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/kdb.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/limits.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/machdep.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/md_var.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/memdev.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/metadata.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/mutex.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/param.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/pcb.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/pcpu.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/pmap.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/proc.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/profile.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/psl.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/pte.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/ptrace.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/reg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/reloc.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/resource.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/runq.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/setjmp.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/sigframe.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/signal.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/smp.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/stdarg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/swi.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/sysarch.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/trap.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/ucontext.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/undefined.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/utrap.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/include/vmparam.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/files.avila#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/std.avila#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/xscalereg.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/xscale/xscalevar.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/boot/README#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/boot2/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/boot2/board.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/arm_init.S#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/memset.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/Makefile.inc#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/bcache.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/boot.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/bootstrap.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/commands.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/console.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/dev_net.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/dev_net.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/devopen.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/help.common#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/interp.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/interp_backslash.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/interp_forth.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/interp_parse.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/isapnp.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/isapnp.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/load.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/load_elf.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/load_elf_obj.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/loader.8#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/ls.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/merge_help.awk#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/misc.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/module.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/newvers.sh#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/panic.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/pnp.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/reloc_elf.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/reloc_elf32.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/reloc_elf64.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/common/ufsread.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/Makefile.inc#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/include/README#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/include/efi.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/include/efiapi.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/include/eficon.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/include/efidebug.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/include/efidef.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/include/efidevp.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/include/efierr.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/include/efifs.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/include/efilib.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/include/efinet.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/include/efipart.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/include/efiprot.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/include/efiser.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/libefi/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/libefi/delay.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/libefi/errno.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/libefi/handles.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/efi/libefi/time.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/dict.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/ficl.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/ficl.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/float.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/loader.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/math64.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/math64.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/prefix.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/search.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/stack.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/testmain.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/tools.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/unix.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/vm.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/ficl/words.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/zcopybpf/src/sys/boot/forth/frames.4th#1 branch .. //depot/projects/zcopybpf/src/sys/boot/forth/loader.4th#1 branch .. //depot/projects/zcopybpf/src/sys/boot/forth/loader.4th.8#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jan 23 21:58:37 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F40B16A405; Tue, 23 Jan 2007 21:58:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 656A416A403 for ; Tue, 23 Jan 2007 21:58:37 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 57B2413C442 for ; Tue, 23 Jan 2007 21:58:37 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0NLwbPv053033 for ; Tue, 23 Jan 2007 21:58:37 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0NLwaUX053030 for perforce@freebsd.org; Tue, 23 Jan 2007 21:58:36 GMT (envelope-from mjacob@freebsd.org) Date: Tue, 23 Jan 2007 21:58:36 GMT Message-Id: <200701232158.l0NLwaUX053030@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 113465 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Jan 2007 21:58:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=113465 Change 113465 by mjacob@mjexp_6 on 2007/01/23 21:58:23 Integrate from vendor branch. Affected files ... .. //depot/projects/mjexp_6/sys/dev/aac/aac_linux.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/acpica/acpi_package.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/acpica/acpi_throttle.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/mjexp_6/sys/dev/usb/ums.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/mjexp_6/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/mjexp_6/sys/net/bridgestp.c#2 integrate .. //depot/projects/mjexp_6/sys/net/bridgestp.h#1 branch .. //depot/projects/mjexp_6/sys/net/if_bridge.c#3 integrate .. //depot/projects/mjexp_6/sys/net/if_bridgevar.h#3 integrate .. //depot/projects/mjexp_6/sys/netinet6/icmp6.c#2 integrate Differences ... ==== //depot/projects/mjexp_6/sys/dev/aac/aac_linux.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_linux.c,v 1.3 2004/05/30 20:08:23 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_linux.c,v 1.3.8.1 2007/01/20 07:05:55 delphij Exp $"); /* * Linux ioctl handler for the aac device driver @@ -38,8 +38,13 @@ #include #include #include +#ifdef __amd64__ +#include +#include +#else #include #include +#endif #include /* There are multiple ioctl number ranges that need to be handled */ ==== //depot/projects/mjexp_6/sys/dev/acpica/acpi.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.214.2.8 2006/10/04 19:08:23 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.214.2.9 2007/01/23 07:21:23 njl Exp $"); #include "opt_acpi.h" #include @@ -1110,7 +1110,7 @@ /* Allocate an IO port or memory resource, given its GAS. */ int acpi_bus_alloc_gas(device_t dev, int *type, int *rid, ACPI_GENERIC_ADDRESS *gas, - struct resource **res) + struct resource **res, u_int flags) { int error, res_type; @@ -1143,7 +1143,7 @@ bus_set_resource(dev, res_type, *rid, gas->Address, gas->RegisterBitWidth / 8); - *res = bus_alloc_resource_any(dev, res_type, rid, RF_ACTIVE); + *res = bus_alloc_resource_any(dev, res_type, rid, RF_ACTIVE | flags); if (*res != NULL) { *type = res_type; error = 0; ==== //depot/projects/mjexp_6/sys/dev/acpica/acpi_cpu.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.57.2.1 2005/11/05 23:49:39 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.57.2.2 2007/01/23 07:21:23 njl Exp $"); #include "opt_acpi.h" #include @@ -51,9 +51,6 @@ /* * Support for ACPI Processor devices, including C[1-3] sleep states. - * - * TODO: implement scans of all CPUs to be sure all Cx states are - * equivalent. */ /* Hooks for the ACPI CA debugging infrastructure */ @@ -80,10 +77,20 @@ int cpu_cx_count; /* Number of valid Cx states. */ int cpu_prev_sleep;/* Last idle sleep duration. */ int cpu_features; /* Child driver supported features. */ + /* Runtime state. */ + int cpu_non_c3; /* Index of lowest non-C3 state. */ + int cpu_short_slp; /* Count of < 1us sleeps. */ + u_int cpu_cx_stats[MAX_CX_STATES];/* Cx usage history. */ + /* Values for sysctl. */ + struct sysctl_ctx_list cpu_sysctl_ctx; + struct sysctl_oid *cpu_sysctl_tree; + int cpu_cx_lowest; + char cpu_cx_supported[64]; + int cpu_rid; }; struct acpi_cpu_device { - struct resource_list ad_rl; + struct resource_list ad_rl; }; #define CPU_GET_REG(reg, width) \ @@ -110,20 +117,17 @@ /* Platform hardware resource information. */ static uint32_t cpu_smi_cmd; /* Value to write to SMI_CMD. */ static uint8_t cpu_cst_cnt; /* Indicate we are _CST aware. */ -static int cpu_rid; /* Driver-wide resource id. */ static int cpu_quirks; /* Indicate any hardware bugs. */ /* Runtime state. */ -static int cpu_cx_count; /* Number of valid states */ -static int cpu_non_c3; /* Index of lowest non-C3 state. */ -static int cpu_short_slp; /* Count of < 1us sleeps. */ -static u_int cpu_cx_stats[MAX_CX_STATES];/* Cx usage history. */ +static int cpu_disable_idle; /* Disable entry to idle function */ +static int cpu_cx_count; /* Number of valid Cx states */ /* Values for sysctl. */ -static struct sysctl_ctx_list acpi_cpu_sysctl_ctx; -static struct sysctl_oid *acpi_cpu_sysctl_tree; +static struct sysctl_ctx_list cpu_sysctl_ctx; +static struct sysctl_oid *cpu_sysctl_tree; +static int cpu_cx_generic; static int cpu_cx_lowest; -static char cpu_cx_supported[64]; static device_t *cpu_devices; static int cpu_ndevices; @@ -140,15 +144,17 @@ static int acpi_cpu_read_ivar(device_t dev, device_t child, int index, uintptr_t *result); static int acpi_cpu_shutdown(device_t dev); -static int acpi_cpu_cx_probe(struct acpi_cpu_softc *sc); +static void acpi_cpu_cx_probe(struct acpi_cpu_softc *sc); +static void acpi_cpu_generic_cx_probe(struct acpi_cpu_softc *sc); static int acpi_cpu_cx_cst(struct acpi_cpu_softc *sc); static void acpi_cpu_startup(void *arg); -static void acpi_cpu_startup_cx(void); +static void acpi_cpu_startup_cx(struct acpi_cpu_softc *sc); static void acpi_cpu_idle(void); static void acpi_cpu_notify(ACPI_HANDLE h, UINT32 notify, void *context); -static int acpi_cpu_quirks(struct acpi_cpu_softc *sc); +static int acpi_cpu_quirks(void); static int acpi_cpu_usage_sysctl(SYSCTL_HANDLER_ARGS); static int acpi_cpu_cx_lowest_sysctl(SYSCTL_HANDLER_ARGS); +static int acpi_cpu_global_cx_lowest_sysctl(SYSCTL_HANDLER_ARGS); static device_method_t acpi_cpu_methods[] = { /* Device interface */ @@ -288,11 +294,24 @@ ACPI_DEBUG_PRINT((ACPI_DB_INFO, "acpi_cpu%d: P_BLK at %#x/%d\n", device_get_unit(dev), sc->cpu_p_blk, sc->cpu_p_blk_len)); - acpi_sc = acpi_device_get_parent_softc(dev); - sysctl_ctx_init(&acpi_cpu_sysctl_ctx); - acpi_cpu_sysctl_tree = SYSCTL_ADD_NODE(&acpi_cpu_sysctl_ctx, - SYSCTL_CHILDREN(acpi_sc->acpi_sysctl_tree), OID_AUTO, "cpu", - CTLFLAG_RD, 0, ""); + /* + * If this is the first cpu we attach, create and initialize the generic + * resources that will be used by all acpi cpu devices. + */ + if (device_get_unit(dev) == 0) { + /* Assume we won't be using generic Cx mode by default */ + cpu_cx_generic = FALSE; + + /* Install hw.acpi.cpu sysctl tree */ + acpi_sc = acpi_device_get_parent_softc(dev); + sysctl_ctx_init(&cpu_sysctl_ctx); + cpu_sysctl_tree = SYSCTL_ADD_NODE(&cpu_sysctl_ctx, + SYSCTL_CHILDREN(acpi_sc->acpi_sysctl_tree), OID_AUTO, "cpu", + CTLFLAG_RD, 0, "node for CPU children"); + + /* Queue post cpu-probing task handler */ + AcpiOsQueueForExecution(OSD_PRIORITY_LO, acpi_cpu_startup, NULL); + } /* * Before calling any CPU methods, collect child driver feature hints @@ -327,17 +346,8 @@ AcpiEvaluateObject(sc->cpu_handle, "_PDC", &arglist, NULL); } - /* - * Probe for Cx state support. If it isn't present, free up unused - * resources. - */ - if (acpi_cpu_cx_probe(sc) == 0) { - status = AcpiInstallNotifyHandler(sc->cpu_handle, ACPI_DEVICE_NOTIFY, - acpi_cpu_notify, sc); - if (device_get_unit(dev) == 0) - AcpiOsQueueForExecution(OSD_PRIORITY_LO, acpi_cpu_startup, NULL); - } else - sysctl_ctx_free(&acpi_cpu_sysctl_ctx); + /* Probe for Cx state support. */ + acpi_cpu_cx_probe(sc); /* Finally, call identify and probe/attach for child devices. */ bus_generic_probe(dev); @@ -371,7 +381,7 @@ * return the pc_cpuid to reference this processor. */ if (pcpu_data->pc_acpi_id == 0xffffffff) - pcpu_data->pc_acpi_id = *acpi_id; + pcpu_data->pc_acpi_id = *acpi_id; else if (pcpu_data->pc_acpi_id != *acpi_id) *acpi_id = pcpu_data->pc_acpi_id; *cpu_id = pcpu_data->pc_cpuid; @@ -396,17 +406,17 @@ static device_t acpi_cpu_add_child(device_t dev, int order, const char *name, int unit) { - struct acpi_cpu_device *ad; - device_t child; + struct acpi_cpu_device *ad; + device_t child; if ((ad = malloc(sizeof(*ad), M_TEMP, M_NOWAIT | M_ZERO)) == NULL) - return (NULL); + return (NULL); resource_list_init(&ad->ad_rl); child = device_add_child_ordered(dev, order, name, unit); if (child != NULL) - device_set_ivars(child, ad); + device_set_ivars(child, ad); else free(ad, M_TEMP); return (child); @@ -440,7 +450,7 @@ bus_generic_shutdown(dev); /* Disable any entry to the idle function. */ - cpu_cx_count = 0; + cpu_disable_idle = TRUE; /* Signal and wait for all processors to exit acpi_cpu_idle(). */ smp_rendezvous(NULL, NULL, NULL, NULL); @@ -448,105 +458,100 @@ return_VALUE (0); } -static int +static void acpi_cpu_cx_probe(struct acpi_cpu_softc *sc) { - ACPI_GENERIC_ADDRESS gas; - struct acpi_cx *cx_ptr; - int error; + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); - ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); + /* Use initial sleep value of 1 sec. to start with lowest idle state. */ + sc->cpu_prev_sleep = 1000000; + sc->cpu_cx_lowest = 0; /* - * Bus mastering arbitration control is needed to keep caches coherent - * while sleeping in C3. If it's not present but a working flush cache - * instruction is present, flush the caches before entering C3 instead. - * Otherwise, just disable C3 completely. + * Check for the ACPI 2.0 _CST sleep states object. If we can't find + * any, we'll revert to generic FADT/P_BLK Cx control method which will + * be handled by acpi_cpu_startup. We need to defer to after having + * probed all the cpus in the system before probing for generic Cx + * states as we may already have found cpus with valid _CST packages */ - if (AcpiGbl_FADT->V1_Pm2CntBlk == 0 || AcpiGbl_FADT->Pm2CntLen == 0) { - if (AcpiGbl_FADT->WbInvd && AcpiGbl_FADT->WbInvdFlush == 0) { - cpu_quirks |= CPU_QUIRK_NO_BM_CTRL; - ACPI_DEBUG_PRINT((ACPI_DB_INFO, - "acpi_cpu%d: no BM control, using flush cache method\n", - device_get_unit(sc->cpu_dev))); - } else { - cpu_quirks |= CPU_QUIRK_NO_C3; - ACPI_DEBUG_PRINT((ACPI_DB_INFO, - "acpi_cpu%d: no BM control, C3 not available\n", - device_get_unit(sc->cpu_dev))); - } + if (!cpu_cx_generic && acpi_cpu_cx_cst(sc) != 0) { + /* + * We were unable to find a _CST package for this cpu or there + * was an error parsing it. Switch back to generic mode. + */ + cpu_cx_generic = TRUE; + if (bootverbose) + device_printf(sc->cpu_dev, "switching to generic Cx mode\n"); } /* - * First, check for the ACPI 2.0 _CST sleep states object. - * If not usable, fall back to the P_BLK's P_LVL2 and P_LVL3. + * TODO: _CSD Package should be checked here. */ +} + +static void +acpi_cpu_generic_cx_probe(struct acpi_cpu_softc *sc) +{ + ACPI_GENERIC_ADDRESS gas; + struct acpi_cx *cx_ptr; + sc->cpu_cx_count = 0; - error = acpi_cpu_cx_cst(sc); - if (error != 0) { - cx_ptr = sc->cpu_cx_states; + cx_ptr = sc->cpu_cx_states; + + /* Use initial sleep value of 1 sec. to start with lowest idle state. */ + sc->cpu_prev_sleep = 1000000; - /* C1 has been required since just after ACPI 1.0 */ - cx_ptr->type = ACPI_STATE_C1; - cx_ptr->trans_lat = 0; - cpu_non_c3 = 0; - cx_ptr++; - sc->cpu_cx_count++; + /* C1 has been required since just after ACPI 1.0 */ + cx_ptr->type = ACPI_STATE_C1; + cx_ptr->trans_lat = 0; + cx_ptr++; + sc->cpu_cx_count++; - /* - * The spec says P_BLK must be 6 bytes long. However, some systems - * use it to indicate a fractional set of features present so we - * take 5 as C2. Some may also have a value of 7 to indicate - * another C3 but most use _CST for this (as required) and having - * "only" C1-C3 is not a hardship. - */ - if (sc->cpu_p_blk_len < 5) - goto done; + /* + * The spec says P_BLK must be 6 bytes long. However, some systems + * use it to indicate a fractional set of features present so we + * take 5 as C2. Some may also have a value of 7 to indicate + * another C3 but most use _CST for this (as required) and having + * "only" C1-C3 is not a hardship. + */ + if (sc->cpu_p_blk_len < 5) + return; - /* Validate and allocate resources for C2 (P_LVL2). */ - gas.AddressSpaceId = ACPI_ADR_SPACE_SYSTEM_IO; - gas.RegisterBitWidth = 8; - if (AcpiGbl_FADT->Plvl2Lat <= 100) { - gas.Address = sc->cpu_p_blk + 4; - acpi_bus_alloc_gas(sc->cpu_dev, &cx_ptr->res_type, &cpu_rid, &gas, - &cx_ptr->p_lvlx); - if (cx_ptr->p_lvlx != NULL) { - cpu_rid++; - cx_ptr->type = ACPI_STATE_C2; - cx_ptr->trans_lat = AcpiGbl_FADT->Plvl2Lat; - cpu_non_c3 = 1; - cx_ptr++; - sc->cpu_cx_count++; - } + /* Validate and allocate resources for C2 (P_LVL2). */ + gas.AddressSpaceId = ACPI_ADR_SPACE_SYSTEM_IO; + gas.RegisterBitWidth = 8; + if (AcpiGbl_FADT->Plvl2Lat <= 100) { + gas.Address = sc->cpu_p_blk + 4; + acpi_bus_alloc_gas(sc->cpu_dev, &cx_ptr->res_type, &sc->cpu_rid, + &gas, &cx_ptr->p_lvlx, RF_SHAREABLE); + if (cx_ptr->p_lvlx != NULL) { + sc->cpu_rid++; + cx_ptr->type = ACPI_STATE_C2; + cx_ptr->trans_lat = AcpiGbl_FADT->Plvl2Lat; + cx_ptr++; + sc->cpu_cx_count++; } - if (sc->cpu_p_blk_len < 6) - goto done; + } + if (sc->cpu_p_blk_len < 6) + return; - /* Validate and allocate resources for C3 (P_LVL3). */ - if (AcpiGbl_FADT->Plvl3Lat <= 1000 && - (cpu_quirks & CPU_QUIRK_NO_C3) == 0) { - gas.Address = sc->cpu_p_blk + 5; - acpi_bus_alloc_gas(sc->cpu_dev, &cx_ptr->res_type, &cpu_rid, &gas, - &cx_ptr->p_lvlx); - if (cx_ptr->p_lvlx != NULL) { - cpu_rid++; - cx_ptr->type = ACPI_STATE_C3; - cx_ptr->trans_lat = AcpiGbl_FADT->Plvl3Lat; - cx_ptr++; - sc->cpu_cx_count++; - } + /* Validate and allocate resources for C3 (P_LVL3). */ + if (AcpiGbl_FADT->Plvl3Lat <= 1000) { + gas.Address = sc->cpu_p_blk + 5; + acpi_bus_alloc_gas(sc->cpu_dev, &cx_ptr->res_type, &sc->cpu_rid, &gas, + &cx_ptr->p_lvlx, RF_SHAREABLE); + if (cx_ptr->p_lvlx != NULL) { + sc->cpu_rid++; + cx_ptr->type = ACPI_STATE_C3; + cx_ptr->trans_lat = AcpiGbl_FADT->Plvl3Lat; + cx_ptr++; + sc->cpu_cx_count++; } } -done: - /* If no valid registers were found, don't attach. */ - if (sc->cpu_cx_count == 0) - return (ENXIO); - - /* Use initial sleep value of 1 sec. to start with lowest idle state. */ - sc->cpu_prev_sleep = 1000000; - - return (0); + /* Update the largest cx_count seen so far */ + if (sc->cpu_cx_count > cpu_cx_count) + cpu_cx_count = sc->cpu_cx_count; } /* @@ -576,12 +581,12 @@ /* _CST is a package with a count and at least one Cx package. */ top = (ACPI_OBJECT *)buf.Pointer; if (!ACPI_PKG_VALID(top, 2) || acpi_PkgInt32(top, 0, &count) != 0) { - device_printf(sc->cpu_dev, "Invalid _CST package\n"); + device_printf(sc->cpu_dev, "invalid _CST package\n"); AcpiOsFree(buf.Pointer); return (ENXIO); } if (count != top->Package.Count - 1) { - device_printf(sc->cpu_dev, "Invalid _CST state count (%d != %d)\n", + device_printf(sc->cpu_dev, "invalid _CST state count (%d != %d)\n", count, top->Package.Count - 1); count = top->Package.Count - 1; } @@ -607,7 +612,7 @@ /* Validate the state to see if we should use it. */ switch (cx_ptr->type) { case ACPI_STATE_C1: - cpu_non_c3 = i; + sc->cpu_non_c3 = i; cx_ptr++; sc->cpu_cx_count++; continue; @@ -618,7 +623,7 @@ device_get_unit(sc->cpu_dev), i)); continue; } - cpu_non_c3 = i; + sc->cpu_non_c3 = i; break; case ACPI_STATE_C3: default: @@ -642,10 +647,10 @@ #endif /* Allocate the control register for C2 or C3. */ - acpi_PkgGas(sc->cpu_dev, pkg, 0, &cx_ptr->res_type, &cpu_rid, - &cx_ptr->p_lvlx); + acpi_PkgGas(sc->cpu_dev, pkg, 0, &cx_ptr->res_type, &sc->cpu_rid, + &cx_ptr->p_lvlx, RF_SHAREABLE); if (cx_ptr->p_lvlx) { - cpu_rid++; + sc->cpu_rid++; ACPI_DEBUG_PRINT((ACPI_DB_INFO, "acpi_cpu%d: Got C%d - %d latency\n", device_get_unit(sc->cpu_dev), cx_ptr->type, @@ -666,81 +671,119 @@ acpi_cpu_startup(void *arg) { struct acpi_cpu_softc *sc; - int count, i; + int i; /* Get set of CPU devices */ devclass_get_devices(acpi_cpu_devclass, &cpu_devices, &cpu_ndevices); - /* Check for quirks via the first CPU device. */ - sc = device_get_softc(cpu_devices[0]); - acpi_cpu_quirks(sc); - /* - * Make sure all the processors' Cx counts match. We should probably - * also check the contents of each. However, no known systems have - * non-matching Cx counts so we'll deal with this later. + * Setup any quirks that might necessary now that we have probed + * all the CPUs */ - count = MAX_CX_STATES; + acpi_cpu_quirks(); + + cpu_cx_count = 0; + if (cpu_cx_generic) { + /* + * We are using generic Cx mode, probe for available Cx states + * for all processors. + */ + for (i = 0; i < cpu_ndevices; i++) { + sc = device_get_softc(cpu_devices[i]); + acpi_cpu_generic_cx_probe(sc); + } + + /* + * Find the highest Cx state common to all CPUs + * in the system, taking quirks into account. + */ + for (i = 0; i < cpu_ndevices; i++) { + sc = device_get_softc(cpu_devices[i]); + if (sc->cpu_cx_count < cpu_cx_count) + cpu_cx_count = sc->cpu_cx_count; + } + } else { + /* + * We are using _CST mode, remove C3 state if necessary. + * Update the largest Cx state supported in the global cpu_cx_count. + * It will be used in the global Cx sysctl handler. + * As we now know for sure that we will be using _CST mode + * install our notify handler. + */ + for (i = 0; i < cpu_ndevices; i++) { + sc = device_get_softc(cpu_devices[i]); + if (cpu_quirks && CPU_QUIRK_NO_C3) { + sc->cpu_cx_count = sc->cpu_non_c3 + 1; + } + if (sc->cpu_cx_count > cpu_cx_count) + cpu_cx_count = sc->cpu_cx_count; + AcpiInstallNotifyHandler(sc->cpu_handle, ACPI_DEVICE_NOTIFY, + acpi_cpu_notify, sc); + } + } + + /* Perform Cx final initialization. */ for (i = 0; i < cpu_ndevices; i++) { sc = device_get_softc(cpu_devices[i]); - count = min(sc->cpu_cx_count, count); + acpi_cpu_startup_cx(sc); } - cpu_cx_count = count; + + /* Add a sysctl handler to handle global Cx lowest setting */ + SYSCTL_ADD_PROC(&cpu_sysctl_ctx, SYSCTL_CHILDREN(cpu_sysctl_tree), + OID_AUTO, "cx_lowest", CTLTYPE_STRING | CTLFLAG_RW, + NULL, 0, acpi_cpu_global_cx_lowest_sysctl, "A", + "Global lowest Cx sleep state to use"); - /* Perform Cx final initialization. */ - sc = device_get_softc(cpu_devices[0]); - if (cpu_cx_count > 0) - acpi_cpu_startup_cx(); + /* Take over idling from cpu_idle_default(). */ + cpu_cx_lowest = 0; + cpu_disable_idle = FALSE; + cpu_idle_hook = acpi_cpu_idle; } static void -acpi_cpu_startup_cx() +acpi_cpu_startup_cx(struct acpi_cpu_softc *sc) { - struct acpi_cpu_softc *sc; struct sbuf sb; int i; /* - * Set up the list of Cx states, eliminating C3 states by truncating - * cpu_cx_count if quirks indicate C3 is not usable. + * Set up the list of Cx states */ - sc = device_get_softc(cpu_devices[0]); - sbuf_new(&sb, cpu_cx_supported, sizeof(cpu_cx_supported), SBUF_FIXEDLEN); - for (i = 0; i < cpu_cx_count; i++) { - if ((cpu_quirks & CPU_QUIRK_NO_C3) == 0 || - sc->cpu_cx_states[i].type != ACPI_STATE_C3) - sbuf_printf(&sb, "C%d/%d ", i + 1, sc->cpu_cx_states[i].trans_lat); - else - cpu_cx_count = i; + sc->cpu_non_c3 = 0; + sbuf_new(&sb, sc->cpu_cx_supported, sizeof(sc->cpu_cx_supported), + SBUF_FIXEDLEN); + for (i = 0; i < sc->cpu_cx_count; i++) { + sbuf_printf(&sb, "C%d/%d ", i + 1, sc->cpu_cx_states[i].trans_lat); + if (sc->cpu_cx_states[i].type < ACPI_STATE_C3) + sc->cpu_non_c3 = i; } sbuf_trim(&sb); sbuf_finish(&sb); - SYSCTL_ADD_STRING(&acpi_cpu_sysctl_ctx, - SYSCTL_CHILDREN(acpi_cpu_sysctl_tree), - OID_AUTO, "cx_supported", CTLFLAG_RD, cpu_cx_supported, - 0, "Cx/microsecond values for supported Cx states"); - SYSCTL_ADD_PROC(&acpi_cpu_sysctl_ctx, - SYSCTL_CHILDREN(acpi_cpu_sysctl_tree), + + SYSCTL_ADD_STRING(&sc->cpu_sysctl_ctx, + SYSCTL_CHILDREN(device_get_sysctl_tree(sc->cpu_dev)), + OID_AUTO, "cx_supported", CTLFLAG_RD, + sc->cpu_cx_supported, 0, + "Cx/microsecond values for supported Cx states"); + SYSCTL_ADD_PROC(&sc->cpu_sysctl_ctx, + SYSCTL_CHILDREN(device_get_sysctl_tree(sc->cpu_dev)), OID_AUTO, "cx_lowest", CTLTYPE_STRING | CTLFLAG_RW, - NULL, 0, acpi_cpu_cx_lowest_sysctl, "A", + (void *)sc, 0, acpi_cpu_cx_lowest_sysctl, "A", "lowest Cx sleep state to use"); - SYSCTL_ADD_PROC(&acpi_cpu_sysctl_ctx, - SYSCTL_CHILDREN(acpi_cpu_sysctl_tree), + SYSCTL_ADD_PROC(&sc->cpu_sysctl_ctx, + SYSCTL_CHILDREN(device_get_sysctl_tree(sc->cpu_dev)), OID_AUTO, "cx_usage", CTLTYPE_STRING | CTLFLAG_RD, - NULL, 0, acpi_cpu_usage_sysctl, "A", + (void *)sc, 0, acpi_cpu_usage_sysctl, "A", "percent usage for each Cx state"); #ifdef notyet /* Signal platform that we can handle _CST notification. */ - if (cpu_cst_cnt != 0) { + if (!cpu_cx_generic && cpu_cst_cnt != 0) { ACPI_LOCK(acpi); AcpiOsWritePort(cpu_smi_cmd, cpu_cst_cnt, 8); ACPI_UNLOCK(acpi); } #endif - - /* Take over idling from cpu_idle_default(). */ - cpu_idle_hook = acpi_cpu_idle; } /* @@ -758,7 +801,7 @@ int bm_active, cx_next_idx, i; /* If disabled, return immediately. */ - if (cpu_cx_count == 0) { + if (cpu_disable_idle) { ACPI_ENABLE_IRQS(); return; } @@ -779,28 +822,34 @@ * find the lowest state that has a latency less than or equal to * the length of our last sleep. */ - cx_next_idx = cpu_cx_lowest; + cx_next_idx = sc->cpu_cx_lowest; if (sc->cpu_prev_sleep < 100) { /* * If we sleep too short all the time, this system may not implement * C2/3 correctly (i.e. reads return immediately). In this case, * back off and use the next higher level. + * It seems that when you have a dual core cpu (like the Intel Core Duo) + * that both cores will get out of C3 state as soon as one of them + * requires it. This breaks the sleep detection logic as the sleep + * counter is local to each cpu. Disable the sleep logic for now as a + * workaround if there's more than one CPU. The right fix would probably + * be to add quirks for system that don't really support C3 state. */ - if (sc->cpu_prev_sleep <= 1) { - cpu_short_slp++; - if (cpu_short_slp == 1000 && cpu_cx_lowest != 0) { - if (cpu_non_c3 == cpu_cx_lowest && cpu_non_c3 != 0) - cpu_non_c3--; - cpu_cx_lowest--; - cpu_short_slp = 0; + if (mp_ncpus < 2 && sc->cpu_prev_sleep <= 1) { + sc->cpu_short_slp++; + if (sc->cpu_short_slp == 1000 && sc->cpu_cx_lowest != 0) { + if (sc->cpu_non_c3 == sc->cpu_cx_lowest && sc->cpu_non_c3 != 0) + sc->cpu_non_c3--; + sc->cpu_cx_lowest--; + sc->cpu_short_slp = 0; device_printf(sc->cpu_dev, "too many short sleeps, backing off to C%d\n", - cpu_cx_lowest + 1); + sc->cpu_cx_lowest + 1); } } else - cpu_short_slp = 0; + sc->cpu_short_slp = 0; - for (i = cpu_cx_lowest; i >= 0; i--) + for (i = sc->cpu_cx_lowest; i >= 0; i--) if (sc->cpu_cx_states[i].trans_lat <= sc->cpu_prev_sleep) { cx_next_idx = i; break; @@ -819,13 +868,13 @@ if (bm_active != 0) { AcpiSetRegister(ACPI_BITREG_BUS_MASTER_STATUS, 1, ACPI_MTX_DO_NOT_LOCK); - cx_next_idx = min(cx_next_idx, cpu_non_c3); + cx_next_idx = min(cx_next_idx, sc->cpu_non_c3); } } /* Select the next state and update statistics. */ cx_next = &sc->cpu_cx_states[cx_next_idx]; - cpu_cx_stats[cx_next_idx]++; + sc->cpu_cx_stats[cx_next_idx]++; KASSERT(cx_next->type != ACPI_STATE_C0, ("acpi_cpu_idle: C0 sleep")); /* @@ -901,16 +950,39 @@ } static int -acpi_cpu_quirks(struct acpi_cpu_softc *sc) +acpi_cpu_quirks(void) { device_t acpi_dev; + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); + + /* + * Bus mastering arbitration control is needed to keep caches coherent + * while sleeping in C3. If it's not present but a working flush cache + * instruction is present, flush the caches before entering C3 instead. + * Otherwise, just disable C3 completely. + */ + if (AcpiGbl_FADT->V1_Pm2CntBlk == 0 || AcpiGbl_FADT->Pm2CntLen == 0) { + if (AcpiGbl_FADT->WbInvd && AcpiGbl_FADT->WbInvdFlush == 0) { + cpu_quirks |= CPU_QUIRK_NO_BM_CTRL; + ACPI_DEBUG_PRINT((ACPI_DB_INFO, + "acpi_cpu: no BM control, using flush cache method\n")); + } else { + cpu_quirks |= CPU_QUIRK_NO_C3; + ACPI_DEBUG_PRINT((ACPI_DB_INFO, + "acpi_cpu: no BM control, C3 not available\n")); + } + } + /* - * C3 on multiple CPUs requires using the expensive flush cache - * instruction. + * If we are using generic Cx mode, C3 on multiple CPUs requires using + * the expensive flush cache instruction. */ - if (mp_ncpus > 1) + if (cpu_cx_generic && mp_ncpus > 1) { cpu_quirks |= CPU_QUIRK_NO_BM_CTRL; + ACPI_DEBUG_PRINT((ACPI_DB_INFO, + "acpi_cpu: SMP, using flush cache mode for C3\n")); + } /* Look for various quirks of the PIIX4 part. */ acpi_dev = pci_find_device(PCI_VENDOR_INTEL, PCI_DEVICE_82371AB_3); @@ -931,6 +1003,8 @@ case PCI_REVISION_4E: case PCI_REVISION_4M: cpu_quirks |= CPU_QUIRK_NO_C3; + ACPI_DEBUG_PRINT((ACPI_DB_INFO, + "acpi_cpu: working around PIIX4 bug, disabling C3\n")); break; default: break; @@ -943,18 +1017,20 @@ static int acpi_cpu_usage_sysctl(SYSCTL_HANDLER_ARGS) { + struct acpi_cpu_softc *sc; struct sbuf sb; char buf[128]; int i; uintmax_t fract, sum, whole; + sc = (struct acpi_cpu_softc *) arg1; sum = 0; - for (i = 0; i < cpu_cx_count; i++) - sum += cpu_cx_stats[i]; + for (i = 0; i < sc->cpu_cx_count; i++) + sum += sc->cpu_cx_stats[i]; sbuf_new(&sb, buf, sizeof(buf), SBUF_FIXEDLEN); - for (i = 0; i < cpu_cx_count; i++) { + for (i = 0; i < sc->cpu_cx_count; i++) { if (sum > 0) { - whole = (uintmax_t)cpu_cx_stats[i] * 100; + whole = (uintmax_t)sc->cpu_cx_stats[i] * 100; fract = (whole % sum) * 100; sbuf_printf(&sb, "%u.%02u%% ", (u_int)(whole / sum), (u_int)(fract / sum)); @@ -976,31 +1052,73 @@ char state[8]; int val, error, i; - sc = device_get_softc(cpu_devices[0]); - snprintf(state, sizeof(state), "C%d", cpu_cx_lowest + 1); + sc = (struct acpi_cpu_softc *) arg1; + snprintf(state, sizeof(state), "C%d", sc->cpu_cx_lowest + 1); error = sysctl_handle_string(oidp, state, sizeof(state), req); if (error != 0 || req->newptr == NULL) return (error); if (strlen(state) < 2 || toupper(state[0]) != 'C') return (EINVAL); val = (int) strtol(state + 1, NULL, 10) - 1; - if (val < 0 || val > cpu_cx_count - 1) + if (val < 0 || val > sc->cpu_cx_count - 1) return (EINVAL); ACPI_SERIAL_BEGIN(cpu); - cpu_cx_lowest = val; + sc->cpu_cx_lowest = val; /* If not disabling, cache the new lowest non-C3 state. */ - cpu_non_c3 = 0; - for (i = cpu_cx_lowest; i >= 0; i--) { + sc->cpu_non_c3 = 0; + for (i = sc->cpu_cx_lowest; i >= 0; i--) { if (sc->cpu_cx_states[i].type < ACPI_STATE_C3) { - cpu_non_c3 = i; + sc->cpu_non_c3 = i; break; } } /* Reset the statistics counters. */ - bzero(cpu_cx_stats, sizeof(cpu_cx_stats)); + bzero(sc->cpu_cx_stats, sizeof(sc->cpu_cx_stats)); + ACPI_SERIAL_END(cpu); + + return (0); +} + +static int +acpi_cpu_global_cx_lowest_sysctl(SYSCTL_HANDLER_ARGS) +{ + struct acpi_cpu_softc *sc; + char state[8]; + int val, error, i, j; + + snprintf(state, sizeof(state), "C%d", cpu_cx_lowest + 1); + error = sysctl_handle_string(oidp, state, sizeof(state), req); + if (error != 0 || req->newptr == NULL) + return (error); + if (strlen(state) < 2 || toupper(state[0]) != 'C') + return (EINVAL); + val = (int) strtol(state + 1, NULL, 10) - 1; + if (val < 0 || val > cpu_cx_count - 1) + return (EINVAL); + + cpu_cx_lowest = val; + + /* + * Update the new lowest useable Cx state for all CPUs + */ + ACPI_SERIAL_BEGIN(cpu); + for (i = 0; i < cpu_ndevices; i++) { + sc = device_get_softc(cpu_devices[i]); + sc->cpu_cx_lowest = cpu_cx_lowest; + sc->cpu_non_c3 = 0; + for (j = sc->cpu_cx_lowest; j >= 0; j++) { + if (sc->cpu_cx_states[i].type < ACPI_STATE_C3) { + sc->cpu_non_c3 = i; + break; + } + } + + /* Reset the statistics counters. */ + bzero(sc->cpu_cx_stats, sizeof(sc->cpu_cx_stats)); + } ACPI_SERIAL_END(cpu); return (0); ==== //depot/projects/mjexp_6/sys/dev/acpica/acpi_package.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_package.c,v 1.6.2.2 2005/11/07 09:53:22 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_package.c,v 1.6.2.3 2007/01/23 07:21:23 njl Exp $"); #include #include @@ -104,7 +104,7 @@ int acpi_PkgGas(device_t dev, ACPI_OBJECT *res, int idx, int *type, int *rid, - struct resource **dst) + struct resource **dst, u_int flags) { ACPI_GENERIC_ADDRESS gas; ACPI_OBJECT *obj; @@ -116,7 +116,7 @@ memcpy(&gas, obj->Buffer.Pointer + 3, sizeof(gas)); - return (acpi_bus_alloc_gas(dev, type, rid, &gas, dst)); + return (acpi_bus_alloc_gas(dev, type, rid, &gas, dst, flags)); } ACPI_HANDLE ==== //depot/projects/mjexp_6/sys/dev/acpica/acpi_perf.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_perf.c,v 1.21.2.3 2006/07/18 14:15:04 bruno Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_perf.c,v 1.21.2.4 2007/01/23 07:21:23 njl Exp $"); #include "opt_acpi.h" #include @@ -191,7 +191,7 @@ pkg = (ACPI_OBJECT *)buf.Pointer; if (ACPI_PKG_VALID(pkg, 2)) { rid = 0; - error = acpi_PkgGas(dev, pkg, 0, &type, &rid, &res); + error = acpi_PkgGas(dev, pkg, 0, &type, &rid, &res, 0); switch (error) { case 0: bus_release_resource(dev, type, rid, res); @@ -329,7 +329,7 @@ } error = acpi_PkgGas(sc->dev, pkg, 0, &sc->perf_ctrl_type, &sc->px_rid, - &sc->perf_ctrl); + &sc->perf_ctrl, 0); if (error) { /* * If the register is of type FFixedHW, we can only return @@ -345,7 +345,7 @@ sc->px_rid++; error = acpi_PkgGas(sc->dev, pkg, 1, &sc->perf_sts_type, &sc->px_rid, - &sc->perf_status); + &sc->perf_status, 0); if (error) { if (error == EOPNOTSUPP) { sc->info_only = TRUE; ==== //depot/projects/mjexp_6/sys/dev/acpica/acpi_throttle.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_throttle.c,v 1.7.2.2 2006/05/11 17:41:00 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_throttle.c,v 1.7.2.3 2007/01/23 07:21:23 njl Exp $"); #include "opt_acpi.h" #include @@ -278,7 +278,7 @@ } memcpy(&gas, obj.Buffer.Pointer + 3, sizeof(gas)); acpi_bus_alloc_gas(sc->cpu_dev, &sc->cpu_p_type, &thr_rid, - &gas, &sc->cpu_p_cnt); + &gas, &sc->cpu_p_cnt, 0); if (sc->cpu_p_cnt != NULL && bootverbose) { device_printf(sc->cpu_dev, "P_CNT from _PTC %#jx\n", gas.Address); @@ -298,7 +298,7 @@ gas.AddressSpaceId = ACPI_ADR_SPACE_SYSTEM_IO; gas.RegisterBitWidth = 32; acpi_bus_alloc_gas(sc->cpu_dev, &sc->cpu_p_type, &thr_rid, - &gas, &sc->cpu_p_cnt); + &gas, &sc->cpu_p_cnt, 0); if (sc->cpu_p_cnt != NULL) { if (bootverbose) device_printf(sc->cpu_dev, ==== //depot/projects/mjexp_6/sys/dev/acpica/acpivar.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/acpica/acpivar.h,v 1.95.2.4 2006/08/02 07:21:24 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.95.2.5 2007/01/23 07:21:23 njl Exp $ */ #ifndef _ACPIVAR_H_ @@ -312,7 +312,8 @@ void acpi_UserNotify(const char *subsystem, ACPI_HANDLE h, uint8_t notify); int acpi_bus_alloc_gas(device_t dev, int *type, int *rid, - ACPI_GENERIC_ADDRESS *gas, struct resource **res); + ACPI_GENERIC_ADDRESS *gas, struct resource **res, + u_int flags); struct acpi_parse_resource_set { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 24 05:31:25 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CAC716A406; Wed, 24 Jan 2007 05:31:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 363A416A405 for ; Wed, 24 Jan 2007 05:31:25 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 23B6513C4B8 for ; Wed, 24 Jan 2007 05:31:25 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0O5VPsx066008 for ; Wed, 24 Jan 2007 05:31:25 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0O5V4cL065672 for perforce@freebsd.org; Wed, 24 Jan 2007 05:31:04 GMT (envelope-from mjacob@freebsd.org) Date: Wed, 24 Jan 2007 05:31:04 GMT Message-Id: <200701240531.l0O5V4cL065672@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 113472 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Jan 2007 05:31:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=113472 Change 113472 by mjacob@mjexp on 2007/01/24 05:30:03 IFC. Integrate early, and often. Affected files ... .. //depot/projects/mjexp/Makefile.inc1#4 integrate .. //depot/projects/mjexp/bin/sh/exec.c#3 integrate .. //depot/projects/mjexp/contrib/ncurses/ANNOUNCE#2 integrate .. //depot/projects/mjexp/contrib/ncurses/AUTHORS#1 branch .. //depot/projects/mjexp/contrib/ncurses/FREEBSD-Xlist#1 branch .. //depot/projects/mjexp/contrib/ncurses/FREEBSD-upgrade#1 branch .. //depot/projects/mjexp/contrib/ncurses/INSTALL#2 integrate .. //depot/projects/mjexp/contrib/ncurses/MANIFEST#2 integrate .. //depot/projects/mjexp/contrib/ncurses/Makefile.glibc#2 delete .. //depot/projects/mjexp/contrib/ncurses/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/ncurses/Makefile.os2#2 integrate .. //depot/projects/mjexp/contrib/ncurses/NEWS#2 integrate .. //depot/projects/mjexp/contrib/ncurses/README#2 integrate .. //depot/projects/mjexp/contrib/ncurses/README.emx#2 integrate .. //depot/projects/mjexp/contrib/ncurses/README.glibc#2 delete .. //depot/projects/mjexp/contrib/ncurses/TO-DO#2 integrate .. //depot/projects/mjexp/contrib/ncurses/aclocal.m4#2 integrate .. //depot/projects/mjexp/contrib/ncurses/announce.html.in#2 integrate .. //depot/projects/mjexp/contrib/ncurses/c++/Makefile.in#2 delete .. //depot/projects/mjexp/contrib/ncurses/c++/NEWS#2 delete .. //depot/projects/mjexp/contrib/ncurses/c++/PROBLEMS#2 delete .. //depot/projects/mjexp/contrib/ncurses/c++/README-first#2 delete .. //depot/projects/mjexp/contrib/ncurses/c++/cursesapp.cc#2 delete .. //depot/projects/mjexp/contrib/ncurses/c++/cursesapp.h#2 delete .. //depot/projects/mjexp/contrib/ncurses/c++/cursesf.cc#2 delete .. //depot/projects/mjexp/contrib/ncurses/c++/cursesf.h#2 delete .. //depot/projects/mjexp/contrib/ncurses/c++/cursesm.cc#2 delete .. //depot/projects/mjexp/contrib/ncurses/c++/cursesm.h#2 delete .. //depot/projects/mjexp/contrib/ncurses/c++/cursesmain.cc#2 delete .. //depot/projects/mjexp/contrib/ncurses/c++/cursesp.cc#2 delete .. //depot/projects/mjexp/contrib/ncurses/c++/cursesp.h#2 delete .. //depot/projects/mjexp/contrib/ncurses/c++/cursespad.cc#2 delete .. //depot/projects/mjexp/contrib/ncurses/c++/cursesw.cc#2 delete .. //depot/projects/mjexp/contrib/ncurses/c++/cursesw.h#2 delete .. //depot/projects/mjexp/contrib/ncurses/c++/cursslk.cc#2 delete .. //depot/projects/mjexp/contrib/ncurses/c++/cursslk.h#2 delete .. //depot/projects/mjexp/contrib/ncurses/c++/demo.cc#2 delete .. //depot/projects/mjexp/contrib/ncurses/c++/edit_cfg.sh#2 delete .. //depot/projects/mjexp/contrib/ncurses/c++/etip.h.in#2 delete .. //depot/projects/mjexp/contrib/ncurses/c++/headers#2 delete .. //depot/projects/mjexp/contrib/ncurses/c++/internal.h#2 delete .. //depot/projects/mjexp/contrib/ncurses/c++/modules#2 delete .. //depot/projects/mjexp/contrib/ncurses/config.guess#2 integrate .. //depot/projects/mjexp/contrib/ncurses/config.sub#2 integrate .. //depot/projects/mjexp/contrib/ncurses/configure#2 integrate .. //depot/projects/mjexp/contrib/ncurses/configure.in#2 integrate .. //depot/projects/mjexp/contrib/ncurses/convert_configure.pl#2 integrate .. //depot/projects/mjexp/contrib/ncurses/dist.mk#2 integrate .. //depot/projects/mjexp/contrib/ncurses/doc/hackguide.doc#2 integrate .. //depot/projects/mjexp/contrib/ncurses/doc/html/NCURSES-Programming-HOWTO.html#1 branch .. //depot/projects/mjexp/contrib/ncurses/doc/html/announce.html#2 integrate .. //depot/projects/mjexp/contrib/ncurses/doc/html/hackguide.html#2 integrate .. //depot/projects/mjexp/contrib/ncurses/doc/html/ncurses-intro.html#2 integrate .. //depot/projects/mjexp/contrib/ncurses/doc/ncurses-intro.doc#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/READ.ME#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/f_trace.c#1 branch .. //depot/projects/mjexp/contrib/ncurses/form/fld_arg.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/fld_attr.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/fld_current.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/fld_def.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/fld_dup.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/fld_ftchoice.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/fld_ftlink.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/fld_info.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/fld_just.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/fld_link.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/fld_max.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/fld_move.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/fld_newftyp.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/fld_opts.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/fld_pad.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/fld_page.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/fld_stat.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/fld_type.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/fld_user.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/form.h#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/form.priv.h#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/frm_cursor.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/frm_data.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/frm_def.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/frm_driver.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/frm_hook.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/frm_opts.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/frm_page.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/frm_post.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/frm_req_name.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/frm_scale.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/frm_sub.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/frm_user.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/frm_win.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/fty_alnum.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/fty_alpha.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/fty_enum.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/fty_int.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/fty_ipv4.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/fty_num.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/fty_regex.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/llib-lform#2 integrate .. //depot/projects/mjexp/contrib/ncurses/form/llib-lformw#1 branch .. //depot/projects/mjexp/contrib/ncurses/form/modules#2 integrate .. //depot/projects/mjexp/contrib/ncurses/include/Caps#2 integrate .. //depot/projects/mjexp/contrib/ncurses/include/Caps.aix4#2 integrate .. //depot/projects/mjexp/contrib/ncurses/include/Caps.hpux11#1 branch .. //depot/projects/mjexp/contrib/ncurses/include/Caps.keys#2 integrate .. //depot/projects/mjexp/contrib/ncurses/include/Caps.osf1r5#2 integrate .. //depot/projects/mjexp/contrib/ncurses/include/Caps.uwin#2 integrate .. //depot/projects/mjexp/contrib/ncurses/include/MKhashsize.sh#2 integrate .. //depot/projects/mjexp/contrib/ncurses/include/MKkey_defs.sh#2 integrate .. //depot/projects/mjexp/contrib/ncurses/include/MKncurses_def.sh#2 integrate .. //depot/projects/mjexp/contrib/ncurses/include/MKparametrized.sh#2 integrate .. //depot/projects/mjexp/contrib/ncurses/include/MKterm.h.awk.in#2 integrate .. //depot/projects/mjexp/contrib/ncurses/include/curses.h.in#2 integrate .. //depot/projects/mjexp/contrib/ncurses/include/curses.tail#2 integrate .. //depot/projects/mjexp/contrib/ncurses/include/curses.wide#2 integrate .. //depot/projects/mjexp/contrib/ncurses/include/hashed_db.h#1 branch .. //depot/projects/mjexp/contrib/ncurses/include/nc_alloc.h#2 integrate .. //depot/projects/mjexp/contrib/ncurses/include/nc_tparm.h#1 branch .. //depot/projects/mjexp/contrib/ncurses/include/ncurses_cfg.hin#2 integrate .. //depot/projects/mjexp/contrib/ncurses/include/ncurses_defs#2 integrate .. //depot/projects/mjexp/contrib/ncurses/include/ncurses_dll.h#2 integrate .. //depot/projects/mjexp/contrib/ncurses/include/term_entry.h#2 integrate .. //depot/projects/mjexp/contrib/ncurses/include/tic.h#2 integrate .. //depot/projects/mjexp/contrib/ncurses/install-sh#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/captoinfo.1m#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/clear.1#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_add_wch.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_add_wchstr.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_addch.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_addchstr.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_addstr.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_addwstr.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_attr.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_beep.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_bkgd.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_bkgrnd.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_border.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_border_set.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_clear.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_color.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_delch.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_deleteln.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_extend.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_get_wch.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_get_wstr.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_getcchar.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_getch.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_getstr.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_getyx.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_in_wch.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_in_wchstr.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_inch.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_inchstr.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_initscr.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_inopts.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_ins_wch.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_ins_wstr.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_insch.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_insstr.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_instr.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_inwstr.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_kernel.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_mouse.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_move.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_outopts.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_overlay.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_pad.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_print.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_printw.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_refresh.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_scanw.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_scr_dump.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_scroll.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_slk.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_termattrs.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_termcap.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_terminfo.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_touch.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_trace.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_util.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/curs_window.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/default_colors.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/define_key.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/form.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/form_cursor.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/form_data.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/form_driver.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/form_field.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/form_field_attributes.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/form_field_buffer.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/form_field_info.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/form_field_just.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/form_field_new.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/form_field_opts.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/form_field_userptr.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/form_field_validation.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/form_fieldtype.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/form_hook.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/form_new.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/form_new_page.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/form_opts.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/form_page.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/form_post.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/form_requestname.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/form_userptr.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/form_win.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/infocmp.1m#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/infotocap.1m#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/key_defined.3x#1 branch .. //depot/projects/mjexp/contrib/ncurses/man/keybound.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/keyok.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/legacy_coding.3x#1 branch .. //depot/projects/mjexp/contrib/ncurses/man/make_sed.sh#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/man_db.renames#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/manlinks.sed#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/menu.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/menu_attributes.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/menu_cursor.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/menu_driver.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/menu_format.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/menu_hook.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/menu_items.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/menu_mark.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/menu_new.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/menu_opts.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/menu_pattern.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/menu_post.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/menu_requestname.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/menu_spacing.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/menu_userptr.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/menu_win.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/mitem_current.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/mitem_name.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/mitem_new.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/mitem_opts.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/mitem_userptr.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/mitem_value.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/ncurses.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/panel.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/resizeterm.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/term.5#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/term.7#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/terminfo.head#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/terminfo.tail#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/tic.1m#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/toe.1m#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/tput.1#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/tset.1#2 integrate .. //depot/projects/mjexp/contrib/ncurses/man/wresize.3x#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/READ.ME#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/eti.h#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/llib-lmenu#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/llib-lmenuw#1 branch .. //depot/projects/mjexp/contrib/ncurses/menu/m_attribs.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/m_cursor.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/m_driver.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/m_format.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/m_global.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/m_hook.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/m_item_cur.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/m_item_nam.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/m_item_new.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/m_item_opt.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/m_item_top.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/m_item_use.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/m_item_val.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/m_item_vis.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/m_items.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/m_new.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/m_opts.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/m_pad.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/m_pattern.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/m_post.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/m_req_name.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/m_scale.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/m_spacing.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/m_sub.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/m_trace.c#1 branch .. //depot/projects/mjexp/contrib/ncurses/menu/m_userptr.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/m_win.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/menu.h#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/menu.priv.h#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/mf_common.h#2 integrate .. //depot/projects/mjexp/contrib/ncurses/menu/modules#2 integrate .. //depot/projects/mjexp/contrib/ncurses/misc/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/ncurses/misc/chkdef.cmd#2 integrate .. //depot/projects/mjexp/contrib/ncurses/misc/cleantic.cmd#2 integrate .. //depot/projects/mjexp/contrib/ncurses/misc/cmpdef.cmd#2 integrate .. //depot/projects/mjexp/contrib/ncurses/misc/csort#1 branch .. //depot/projects/mjexp/contrib/ncurses/misc/emx.src#2 integrate .. //depot/projects/mjexp/contrib/ncurses/misc/gen_edit.sh#1 branch .. //depot/projects/mjexp/contrib/ncurses/misc/indent.pro#2 delete .. //depot/projects/mjexp/contrib/ncurses/misc/jpf-indent#1 branch .. //depot/projects/mjexp/contrib/ncurses/misc/makedef.cmd#2 integrate .. //depot/projects/mjexp/contrib/ncurses/misc/ncu-indent#1 branch .. //depot/projects/mjexp/contrib/ncurses/misc/ncurses-config.in#1 branch .. //depot/projects/mjexp/contrib/ncurses/misc/run_tic.in#2 integrate .. //depot/projects/mjexp/contrib/ncurses/misc/shlib#2 integrate .. //depot/projects/mjexp/contrib/ncurses/misc/terminfo.src#2 integrate .. //depot/projects/mjexp/contrib/ncurses/mk-0th.awk#2 integrate .. //depot/projects/mjexp/contrib/ncurses/mk-1st.awk#2 integrate .. //depot/projects/mjexp/contrib/ncurses/mk-2nd.awk#2 integrate .. //depot/projects/mjexp/contrib/ncurses/mkinstalldirs#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/README#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/README.IZ#1 branch .. //depot/projects/mjexp/contrib/ncurses/ncurses/SigAction.h#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/MKkeyname.awk#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/MKlib_gen.sh#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/MKunctrl.awk#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/README#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/define_key.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/key_defined.c#1 branch .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/keybound.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/keyok.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/legacy_coding.c#1 branch .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_addch.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_addstr.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_beep.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_bkgd.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_box.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_chgat.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_clrbot.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_color.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_colorset.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_dft_fgbg.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_erase.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_freeall.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_getch.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_getstr.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_hline.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_initscr.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_insch.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_insdel.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_insnstr.c#1 branch .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_insstr.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_instr.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_mouse.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_move.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_mvwin.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_newterm.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_newwin.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_overlay.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_pad.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_printw.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_redrawln.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_refresh.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_restart.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_screen.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_scroll.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_set_term.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_slk.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_slkatr_set.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_slkatrof.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_slkatron.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_slkatrset.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_slkattr.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_slkclear.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_slkcolor.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_slklab.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_slkrefr.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_slkset.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_ungetch.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_vline.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_wattroff.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_wattron.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/lib_window.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/resizeterm.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/safe_sprintf.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/sigaction.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/tries.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/version.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/vsscanf.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/base/wresize.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/curses.priv.h#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/llib-lncurses#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/llib-lncursesw#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/modules#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/MKfallback.sh#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/MKkeys_list.sh#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/MKnames.awk#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/README#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/access.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/add_tries.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/alloc_entry.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/alloc_ttype.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/captoinfo.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/comp_error.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/comp_expand.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/comp_hash.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/comp_parse.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/comp_scan.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/db_iterator.c#1 branch .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/doalloc.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/free_ttype.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/hashed_db.c#1 branch .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/home_terminfo.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/init_keytry.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/lib_acs.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/lib_cur_term.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/lib_data.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/lib_has_cap.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/lib_kernel.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/lib_napms.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/lib_options.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/lib_print.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/lib_raw.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/lib_setup.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/lib_termcap.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/lib_termname.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/lib_tgoto.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/lib_ti.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/lib_tparm.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/lib_tputs.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/make_keys.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/name_match.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/parse_entry.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/read_entry.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/read_termcap.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/setbuf.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/strings.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#1 branch .. //depot/projects/mjexp/contrib/ncurses/ncurses/tinfo/write_entry.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/trace/README#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/trace/lib_trace.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/trace/lib_traceatr.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/trace/lib_tracebits.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/trace/lib_tracechr.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/trace/lib_tracedmp.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/trace/lib_tracemse.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/trace/trace_buf.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/trace/varargs.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/trace/visbuf.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tty/MKexpanded.sh#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tty/hashmap.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tty/lib_mvcur.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tty/lib_tstp.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tty/lib_twait.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tty/lib_vidattr.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tty/tty_display.h#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/tty/tty_update.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/widechar/charable.c#1 branch .. //depot/projects/mjexp/contrib/ncurses/ncurses/widechar/lib_add_wch.c#1 branch .. //depot/projects/mjexp/contrib/ncurses/ncurses/widechar/lib_box_set.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/widechar/lib_cchar.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/widechar/lib_get_wch.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/widechar/lib_get_wstr.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/widechar/lib_in_wch.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/widechar/lib_ins_nwstr.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/ncurses/widechar/lib_ins_wch.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/widechar/lib_inwstr.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/widechar/lib_pecho_wchar.c#1 branch .. //depot/projects/mjexp/contrib/ncurses/ncurses/widechar/lib_slk_wset.c#1 branch .. //depot/projects/mjexp/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/widechar/lib_wacs.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/panel/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/ncurses/panel/llib-lpanel#2 integrate .. //depot/projects/mjexp/contrib/ncurses/panel/llib-lpanelw#1 branch .. //depot/projects/mjexp/contrib/ncurses/panel/p_above.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/panel/p_below.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/panel/p_bottom.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/panel/p_delete.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/panel/p_hidden.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/panel/p_hide.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/panel/p_move.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/panel/p_new.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/panel/p_replace.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/panel/p_show.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/panel/p_top.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/panel/p_update.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/panel/p_user.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/panel/p_win.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/panel/panel.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/panel/panel.h#2 integrate .. //depot/projects/mjexp/contrib/ncurses/panel/panel.priv.h#2 integrate .. //depot/projects/mjexp/contrib/ncurses/progs/MKtermsort.sh#2 integrate .. //depot/projects/mjexp/contrib/ncurses/progs/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/ncurses/progs/capconvert#2 integrate .. //depot/projects/mjexp/contrib/ncurses/progs/clear.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/progs/clear.sh#2 integrate .. //depot/projects/mjexp/contrib/ncurses/progs/dump_entry.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/progs/dump_entry.h#2 integrate .. //depot/projects/mjexp/contrib/ncurses/progs/infocmp.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/progs/modules#2 integrate .. //depot/projects/mjexp/contrib/ncurses/progs/progs.priv.h#2 integrate .. //depot/projects/mjexp/contrib/ncurses/progs/tic.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/progs/toe.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/progs/tput.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/progs/tset.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/tack/COPYING#2 integrate .. //depot/projects/mjexp/contrib/ncurses/tack/HISTORY#2 integrate .. //depot/projects/mjexp/contrib/ncurses/tack/Makefile.in#2 integrate .. //depot/projects/mjexp/contrib/ncurses/tack/ansi.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/tack/charset.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/tack/color.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/tack/control.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/tack/crum.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/tack/edit.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/tack/fun.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/tack/init.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/tack/menu.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/tack/modes.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/tack/modules#2 integrate .. //depot/projects/mjexp/contrib/ncurses/tack/output.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/tack/pad.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/tack/scan.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/tack/sync.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/tack/sysdep.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/tack/tack.1#2 integrate .. //depot/projects/mjexp/contrib/ncurses/tack/tack.c#2 integrate .. //depot/projects/mjexp/contrib/ncurses/tack/tack.h#2 integrate .. //depot/projects/mjexp/contrib/ncurses/tar-copy.sh#2 integrate .. //depot/projects/mjexp/contrib/ncurses/test/Makefile.in#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/README#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/blue.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/bs.6#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/bs.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/cardfile.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/cardfile.dat#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/configure#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/configure.in#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/ditto.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/dots.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/filter.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/firework.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/firstlast.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/gdc.6#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/gdc.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/hanoi.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/hashtest.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/keynames.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/knight.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/lrtest.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/modules#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/ncurses.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/ncurses_tst.hin#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/newdemo.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/railroad.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/rain.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/tclock.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/test.priv.h#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/testaddch.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/testcurs.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/testscanw.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/tracemunch#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/view.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/worm.c#2 delete .. //depot/projects/mjexp/contrib/ncurses/test/xmas.c#2 delete .. //depot/projects/mjexp/etc/defaults/rc.conf#4 integrate .. //depot/projects/mjexp/etc/rc.d/quota#2 integrate .. //depot/projects/mjexp/lib/Makefile#3 integrate .. //depot/projects/mjexp/lib/libc/gen/siglist.c#3 integrate .. //depot/projects/mjexp/lib/libc/net/nsdispatch.3#3 integrate .. //depot/projects/mjexp/lib/libc/rpc/getnetconfig.c#2 integrate .. //depot/projects/mjexp/lib/libc/rpc/getnetpath.c#2 integrate .. //depot/projects/mjexp/lib/libc/stdtime/localtime.c#2 integrate .. //depot/projects/mjexp/lib/libform/Makefile#2 delete .. //depot/projects/mjexp/lib/libmenu/Makefile#2 delete .. //depot/projects/mjexp/lib/libncurses/Makefile#2 delete .. //depot/projects/mjexp/lib/libncurses/ncurses_cfg.h#2 delete .. //depot/projects/mjexp/lib/libncurses/pathnames.h#3 delete .. //depot/projects/mjexp/lib/libncurses/termcap.c#3 delete .. //depot/projects/mjexp/lib/libpam/modules/pam_radius/pam_radius.c#2 integrate .. //depot/projects/mjexp/lib/libpanel/Makefile#2 delete .. //depot/projects/mjexp/lib/ncurses/Makefile#1 branch .. //depot/projects/mjexp/lib/ncurses/Makefile.inc#1 branch .. //depot/projects/mjexp/lib/ncurses/config.mk#1 branch .. //depot/projects/mjexp/lib/ncurses/form/Makefile#2 integrate .. //depot/projects/mjexp/lib/ncurses/menu/Makefile#2 integrate .. //depot/projects/mjexp/lib/ncurses/ncurses/Makefile#2 integrate .. //depot/projects/mjexp/lib/ncurses/ncurses/ncurses_cfg.h#2 integrate .. //depot/projects/mjexp/lib/ncurses/ncurses/pathnames.h#2 integrate .. //depot/projects/mjexp/lib/ncurses/ncurses/termcap.c#2 integrate .. //depot/projects/mjexp/lib/ncurses/panel/Makefile#2 integrate .. //depot/projects/mjexp/libexec/rtld-elf/rtld.1#2 integrate .. //depot/projects/mjexp/sbin/Makefile#4 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifconfig.8#5 integrate .. //depot/projects/mjexp/sbin/ifconfig/ifmedia.c#3 integrate .. //depot/projects/mjexp/sbin/mount_nfs/Makefile#3 integrate .. //depot/projects/mjexp/sbin/mount_nfs/mount_nfs.8#3 integrate .. //depot/projects/mjexp/sbin/mount_nfs/mount_nfs.c#3 integrate .. //depot/projects/mjexp/sbin/quotacheck/quotacheck.c#3 integrate .. //depot/projects/mjexp/share/dict/freebsd#2 integrate .. //depot/projects/mjexp/share/man/man3/pthread.3#2 integrate .. //depot/projects/mjexp/share/man/man4/if_bridge.4#4 integrate .. //depot/projects/mjexp/share/man/man4/le.4#3 integrate .. //depot/projects/mjexp/share/man/man4/snd_hda.4#5 integrate .. //depot/projects/mjexp/share/man/man4/tcp.4#2 integrate .. //depot/projects/mjexp/share/man/man5/nsswitch.conf.5#2 integrate .. //depot/projects/mjexp/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/mjexp/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/mjexp/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/mjexp/sys/amd64/amd64/mptable_pci.c#4 integrate .. //depot/projects/mjexp/sys/amd64/amd64/msi.c#2 integrate .. //depot/projects/mjexp/sys/amd64/amd64/nexus.c#4 integrate .. //depot/projects/mjexp/sys/amd64/include/clock.h#3 integrate .. //depot/projects/mjexp/sys/amd64/include/intr_machdep.h#5 integrate .. //depot/projects/mjexp/sys/amd64/isa/clock.c#4 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_machdep.c#6 integrate .. //depot/projects/mjexp/sys/amd64/pci/pci_bus.c#4 integrate .. //depot/projects/mjexp/sys/arm/at91/uart_dev_at91usart.c#3 integrate .. //depot/projects/mjexp/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/mjexp/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_emul.c#7 integrate .. //depot/projects/mjexp/sys/conf/files.sparc64#6 integrate .. //depot/projects/mjexp/sys/conf/options.sun4v#2 integrate .. //depot/projects/mjexp/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/mjexp/sys/dev/acpica/acpi_pcib_acpi.c#4 integrate .. //depot/projects/mjexp/sys/dev/acpica/acpi_pcib_pci.c#3 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/mjexp/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/ath/if_ath.c#5 integrate .. //depot/projects/mjexp/sys/dev/ath/if_ath_pci.c#3 integrate .. //depot/projects/mjexp/sys/dev/bce/if_bce.c#8 integrate .. //depot/projects/mjexp/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/mjexp/sys/dev/esp/esp_sbus.c#3 integrate .. //depot/projects/mjexp/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/mjexp/sys/dev/isp/isp.c#10 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#10 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.h#6 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#8 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_sbus.c#5 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_target.c#6 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_target.h#4 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_tpublic.h#4 integrate .. //depot/projects/mjexp/sys/dev/isp/ispvar.h#5 integrate .. //depot/projects/mjexp/sys/dev/le/if_le_cbus.c#2 integrate .. //depot/projects/mjexp/sys/dev/le/if_le_isa.c#2 integrate .. //depot/projects/mjexp/sys/dev/le/if_le_lebuffer.c#1 branch .. //depot/projects/mjexp/sys/dev/le/if_le_ledma.c#2 integrate .. //depot/projects/mjexp/sys/dev/le/if_le_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/le/lance.c#3 integrate .. //depot/projects/mjexp/sys/dev/le/lebuffer_sbus.c#1 branch .. //depot/projects/mjexp/sys/dev/mc146818/mc146818reg.h#2 integrate .. //depot/projects/mjexp/sys/dev/mfi/mfi_pci.c#3 integrate .. //depot/projects/mjexp/sys/dev/mii/mii.c#2 integrate .. //depot/projects/mjexp/sys/dev/mii/rlphy.c#5 integrate .. //depot/projects/mjexp/sys/dev/mii/ukphy.c#2 integrate .. //depot/projects/mjexp/sys/dev/pci/pci.c#8 integrate .. //depot/projects/mjexp/sys/dev/pci/pci_if.m#4 integrate .. //depot/projects/mjexp/sys/dev/pci/pci_pci.c#6 integrate .. //depot/projects/mjexp/sys/dev/pci/pci_private.h#5 integrate .. //depot/projects/mjexp/sys/dev/pci/pcib_if.m#3 integrate .. //depot/projects/mjexp/sys/dev/pci/pcib_private.h#5 integrate .. //depot/projects/mjexp/sys/dev/pci/pcireg.h#5 integrate .. //depot/projects/mjexp/sys/dev/pci/pcivar.h#6 integrate .. //depot/projects/mjexp/sys/dev/re/if_re.c#5 integrate .. //depot/projects/mjexp/sys/dev/sk/if_sk.c#4 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/es137x.c#3 integrate .. //depot/projects/mjexp/sys/dev/sound/sbus/cs4231.c#3 integrate .. //depot/projects/mjexp/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/mjexp/sys/dev/sym/sym_hipd.c#3 integrate .. //depot/projects/mjexp/sys/dev/ti/if_ti.c#2 integrate .. //depot/projects/mjexp/sys/dev/uart/uart_cpu.h#2 integrate .. //depot/projects/mjexp/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/mjexp/sys/dev/uart/uart_dev_sab82532.c#2 integrate .. //depot/projects/mjexp/sys/dev/uart/uart_dev_z8530.c#2 integrate .. //depot/projects/mjexp/sys/dev/uart/uart_kbd_sun.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/mjexp/sys/fs/deadfs/dead_vnops.c#2 integrate .. //depot/projects/mjexp/sys/geom/geom_vfs.c#2 integrate .. //depot/projects/mjexp/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/mjexp/sys/i386/cpufreq/powernow.c#2 integrate .. //depot/projects/mjexp/sys/i386/i386/machdep.c#8 integrate .. //depot/projects/mjexp/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/mjexp/sys/i386/i386/mptable_pci.c#4 integrate .. //depot/projects/mjexp/sys/i386/i386/msi.c#2 integrate .. //depot/projects/mjexp/sys/i386/i386/nexus.c#4 integrate .. //depot/projects/mjexp/sys/i386/include/clock.h#3 integrate .. //depot/projects/mjexp/sys/i386/include/intr_machdep.h#5 integrate .. //depot/projects/mjexp/sys/i386/isa/clock.c#4 integrate .. //depot/projects/mjexp/sys/i386/linux/linux_machdep.c#6 integrate .. //depot/projects/mjexp/sys/i386/pci/pci_bus.c#4 integrate .. //depot/projects/mjexp/sys/kern/init_main.c#7 integrate .. //depot/projects/mjexp/sys/kern/kern_fork.c#6 integrate .. //depot/projects/mjexp/sys/kern/kern_idle.c#5 integrate .. //depot/projects/mjexp/sys/kern/kern_intr.c#6 integrate .. //depot/projects/mjexp/sys/kern/kern_kse.c#5 integrate .. //depot/projects/mjexp/sys/kern/kern_kthread.c#2 integrate .. //depot/projects/mjexp/sys/kern/kern_switch.c#5 integrate .. //depot/projects/mjexp/sys/kern/kern_thr.c#5 integrate .. //depot/projects/mjexp/sys/kern/sched_4bsd.c#7 integrate .. //depot/projects/mjexp/sys/kern/sched_core.c#3 integrate .. //depot/projects/mjexp/sys/kern/sched_ule.c#8 integrate .. //depot/projects/mjexp/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/mjexp/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/mjexp/sys/kern/uipc_mbuf.c#5 integrate .. //depot/projects/mjexp/sys/kern/uipc_socket.c#6 integrate .. //depot/projects/mjexp/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/mjexp/sys/kern/vfs_export.c#4 integrate .. //depot/projects/mjexp/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/mjexp/sys/modules/le/Makefile#2 integrate .. //depot/projects/mjexp/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/mjexp/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/mjexp/sys/pc98/cbus/clock.c#3 integrate .. //depot/projects/mjexp/sys/pc98/pc98/machdep.c#7 integrate .. //depot/projects/mjexp/sys/pci/if_rl.c#4 integrate .. //depot/projects/mjexp/sys/sparc64/include/cache.h#2 integrate .. //depot/projects/mjexp/sys/sparc64/include/frame.h#2 integrate .. //depot/projects/mjexp/sys/sparc64/include/fsr.h#2 integrate .. //depot/projects/mjexp/sys/sparc64/include/intr_machdep.h#2 integrate .. //depot/projects/mjexp/sys/sparc64/include/pcb.h#2 integrate .. //depot/projects/mjexp/sys/sparc64/include/tsb.h#2 integrate .. //depot/projects/mjexp/sys/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/genassym.c#6 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/interrupt.S#2 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/mp_exception.S#2 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/mp_locore.S#2 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/support.S#3 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/swtch.S#2 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/upa.c#2 integrate .. //depot/projects/mjexp/sys/sun4v/include/frame.h#2 integrate .. //depot/projects/mjexp/sys/sun4v/include/fsr.h#2 integrate .. //depot/projects/mjexp/sys/sun4v/include/intr_machdep.h#2 integrate .. //depot/projects/mjexp/sys/sun4v/include/pcb.h#3 integrate .. //depot/projects/mjexp/sys/sun4v/include/utrap.h#3 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/exception.S#5 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/interrupt.S#4 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/mp_locore.S#3 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/support.S#3 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/swtch.S#2 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/wbuf.S#4 integrate .. //depot/projects/mjexp/sys/sys/buf.h#3 integrate .. //depot/projects/mjexp/sys/sys/bufobj.h#2 integrate .. //depot/projects/mjexp/sys/sys/proc.h#8 integrate .. //depot/projects/mjexp/sys/sys/sched.h#5 integrate .. //depot/projects/mjexp/sys/ufs/ffs/ffs_alloc.c#4 integrate .. //depot/projects/mjexp/sys/ufs/ffs/ffs_extern.h#3 integrate .. //depot/projects/mjexp/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/mjexp/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/mjexp/sys/ufs/ufs/quota.h#2 integrate .. //depot/projects/mjexp/sys/ufs/ufs/ufs_quota.c#3 integrate .. //depot/projects/mjexp/sys/vm/vm_glue.c#5 integrate .. //depot/projects/mjexp/sys/vm/vm_zeroidle.c#4 integrate .. //depot/projects/mjexp/tools/sched/schedgraph.py#3 integrate .. //depot/projects/mjexp/usr.bin/systat/convtbl.c#3 integrate .. //depot/projects/mjexp/usr.bin/tr/str.c#2 integrate .. //depot/projects/mjexp/usr.bin/whois/whois.c#2 integrate .. //depot/projects/mjexp/usr.sbin/mount_portalfs/Makefile#2 integrate .. //depot/projects/mjexp/usr.sbin/mount_portalfs/activate.c#2 integrate .. //depot/projects/mjexp/usr.sbin/mount_portalfs/conf.c#2 integrate .. //depot/projects/mjexp/usr.sbin/mount_portalfs/mount_portalfs.c#2 integrate .. //depot/projects/mjexp/usr.sbin/mount_portalfs/portald.h#2 integrate .. //depot/projects/mjexp/usr.sbin/mount_portalfs/pt_exec.c#2 integrate .. //depot/projects/mjexp/usr.sbin/mount_portalfs/pt_file.c#2 integrate .. //depot/projects/mjexp/usr.sbin/mount_portalfs/pt_pipe.c#2 integrate .. //depot/projects/mjexp/usr.sbin/mount_portalfs/pt_tcp.c#2 integrate .. //depot/projects/mjexp/usr.sbin/mount_portalfs/pt_tcplisten.c#2 integrate .. //depot/projects/mjexp/usr.sbin/ndp/ndp.c#2 integrate .. //depot/projects/mjexp/usr.sbin/rtadvd/rtadvd.c#2 integrate .. //depot/projects/mjexp/usr.sbin/timed/timed/globals.h#2 integrate Differences ... ==== //depot/projects/mjexp/Makefile.inc1#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.565 2006/11/27 19:38:28 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.566 2007/01/20 07:48:09 rafan Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -453,7 +453,7 @@ cd ${.CURDIR}/${_dir}; \ ${LIB32MAKE} DESTDIR=${LIB32TMP} obj .endfor -.for _dir in lib/libncurses lib/libmagic +.for _dir in lib/ncurses/ncurses lib/libmagic cd ${.CURDIR}/${_dir}; \ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} DESTDIR= build-tools .endfor @@ -932,7 +932,7 @@ bin/csh \ bin/sh \ ${_rescue} \ - lib/libncurses \ + lib/ncurses/ncurses \ ${_share} \ ${_aicasm} \ usr.bin/awk \ @@ -1020,7 +1020,7 @@ lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ - lib/libncurses lib/libopie lib/libpam \ + lib/ncurses/ncurses lib/libopie lib/libpam \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ==== //depot/projects/mjexp/bin/sh/exec.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.30 2007/01/11 00:19:00 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.31 2007/01/18 22:31:22 stefanf Exp $"); #include #include @@ -780,7 +780,7 @@ " a tracked alias for" : "", name); } else { - if (access(argv[i], X_OK) == 0) { + if (eaccess(argv[i], X_OK) == 0) { if (cmd == TYPECMD_SMALLV) out1fmt("%s\n", argv[i]); else ==== //depot/projects/mjexp/contrib/ncurses/ANNOUNCE#2 (text+ko) ==== @@ -1,486 +1,463 @@ + Announcing ncurses 5.6 - Announcing ncurses 5.2 - - The ncurses (new curses) library is a free software emulation of - curses in System V Release 4.0, and more. It uses terminfo format, - supports pads and color and multiple highlights and forms characters - and function-key mapping, and has all the other SYSV-curses + The ncurses (new curses) library is a free software emulation of + curses in System V Release 4.0, and more. It uses terminfo format, + supports pads and color and multiple highlights and forms characters + and function-key mapping, and has all the other SYSV-curses enhancements over BSD curses. - In mid-June 1995, the maintainer of 4.4BSD curses declared that he - considered 4.4BSD curses obsolete, and is encouraging the keepers of - Unix releases such as BSD/OS, freeBSD and netBSD to switch over to - ncurses. + In mid-June 1995, the maintainer of 4.4BSD curses declared that he + considered 4.4BSD curses obsolete, and encouraged the keepers of Unix + releases such as BSD/OS, FreeBSD and NetBSD to switch over to ncurses. - The ncurses code was developed under GNU/Linux. It should port easily - to any ANSI/POSIX-conforming UNIX. It has even been ported to OS/2 - Warp! + The ncurses code was developed under GNU/Linux. It has been in use for + some time with OpenBSD as the system curses library, and on FreeBSD + and NetBSD as an external package. It should port easily to any + ANSI/POSIX-conforming UNIX. It has even been ported to OS/2 Warp! The distribution includes the library and support utilities, including - a terminfo compiler tic(1), a decompiler infocmp(1), clear(1), - tput(1), tset(1), and a termcap conversion tool captoinfo(1). Full + a terminfo compiler tic(1), a decompiler infocmp(1), clear(1), + tput(1), tset(1), and a termcap conversion tool captoinfo(1). Full manual pages are provided for the library and tools. - The ncurses distribution is available via anonymous FTP at the GNU - distribution site [1]ftp://ftp.gnu.org/pub/gnu/ncurses. - It is also available at [2]ftp://dickey.his.com/ncurses. + The ncurses distribution is available via anonymous FTP at the GNU + distribution site [1]ftp://ftp.gnu.org/gnu/ncurses/ . + It is also available at [2]ftp://invisible-island.net/ncurses/ . Release Notes - This release is designed to be upward compatible from ncurses 5.0 and - 5.1; very few applications will require recompilation, depending on - the platform. These are the highlights from the change-log since - ncurses 5.1 release. + This release is designed to be upward compatible from ncurses 5.0 + through 5.5; very few applications will require recompilation, + depending on the platform. These are the highlights from the + change-log since ncurses 5.5 release. Interface changes: - * change type of ospeed variable back to short to match its use in - legacy applications. It was altered after ncurses 4.2 to speed_t - to repair a type mismatch which was introduced after 1.9.4 in - 1995. The principal users of termcap continued to use short, which - is not the same size. - NOTE: A few applications will have to be recompiled (about 1% of - the programs in a typical Linux distribution, 10% of the programs - that use ncurses). These are easy to identify with nm or strings. - * remove a private function _nc_can_clear_with(), which was built - with the configure --enable-expanded option but not used. - * add several private functions (prefixed with "_nc_") for tracing - chtype values in the debug library, and for better access and - buffer limit checking. + * generate linkable stubs for some macros: + getbegx, getbegy, getcurx, getcury, getmaxx, getmaxy, getparx, + getpary, getpary, + and (for libncursesw) + wgetbkgrnd New features and improvements: - * rewrote tgoto() to make it better support existing termcap - applications which use hardcoded strings rather than obtain all of - their information from the termcap file. If the string does not - appear to be a terminfo string (i.e., does not refer to a "%p" - parameter, or terminfo-style padding), and termcap support is - configured, tgoto() will interpret it as termcap. Otherwise, as - before, it will use tparm(). - * to ensure that the tgoto() changes work properly, added checks to - tic which report capabilities that do not reference the expected - number of parameters. - * new configure script options: - + option --disable-root-environ adds runtime checks which tell - ncurses to disregard $TERMINFO and similar environment - variables if the current user is root, or running - setuid/setgid. - + option --disable-assumed-color allows you to use the pre-5.1 - convention of default colors used for color-pair 0 to be - configured (see assume_default_colors()). - + implement configure script options that transform installed - program names, e.g., --program-prefix, including the manpage - names and cross references. - + option --with-database allows you to specify a different - terminfo source-file to install. On OS/2 EMX, the default is - misc/emx.src, otherwise misc/terminfo.src - + option --with-default-terminfo-dir allows you to specify the - default terminfo database directory. - + option --with-libtool allows you to build with libtool. - NOTE: libtool uses a different notation for numbering shared - library versions from the existing ncurses configuration. - + option --with-manpage-tbl causes the manpages to be - preprocessed by tbl(1) prior to installation, - + option --without-curses-h causes the installation process to - install curses.h as ncurses.h and make appropriate changes to - headers and manpages. - * modified configure script options: - + change symbol used by the --install-prefix configure option - from INSTALL_PREFIX to DESTDIR (the latter has become common - usage although the name is misleading). - + modify ld -rpath options (e.g., Linux, and Solaris) to use an - absolute pathname for the build tree's lib directory, - avoiding confusion with directories relative to the current - one with the installed programs. - + modified misc/run_tic.in to use tic -o, to eliminate - dependency on $TERMINFO variable for installs. - * terminfo database: - + updated xterm terminfo entries to match XFree86 xterm patch - #146. - + added amiga-vnc, Matrix Orbital, and QNX qansi to - misc/terminfo.src. - + added os2 entry to misc/emx.src. - + add S0 and E0 extensions to screen's terminfo entry since - otherwise the FreeBSD port makes it pass termcap equivalents - to tgoto, which would be misinterpreted by older versions of - ncurses. - * improvements to program usability: - + modify programs to use curses_version() string to report the - version of ncurses with which they are compiled rather than - the NCURSES_VERSION string. The function returns the patch - level in addition to the major and minor version numbers. - + modify tput program so it can be renamed or invoked via a - link as 'reset' or 'init', producing the same effect as - tput reset or tput init. - + add error checking to infocmp's -v and -m options to ensure - that the option value is indeed a number. - * improved performance: - + replace a lookup table in lib_vidattr.c used to decode - no_color_video with a logic expression which is faster. + * library + + support hashed databases for the terminal descriptions. This + uses the Berkeley database, has been tested for several + versions on different platforms. + + add use_legacy_coding() function to support lynx's + font-switching feature. + + add extension nofilter(), to cancel a prior filter() call. + + add/install a package config script, e.g., ncurses5-config or + ncursesw5-config, according to configuration options. + + provide ifdef for NCURSES_NOMACROS which suppresses most + macro definitions from curses.h, i.e., where a macro is + defined to override a function to improve performance. + + make ifdef's consistent in curses.h for the extended colors + so the header file can be used for the normal curses library. + The header file installed for extended colors is a variation + of the wide-character configuration. + + improve tgetstr() by making the return value point into the + user's buffer, if provided. + + add ifdef's allowing ncurses to be built with tparm() using + either varargs (the existing status), or using a + fixed-parameter list (to match X/Open). + + widen the test for xterm kmous a little to allow for other + strings than "\E[M", e.g., for xterm-sco functionality in + xterm. + + modify wgetnstr() to return KEY_RESIZE if a sigwinch occurs. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jan 24 05:44:44 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 086A516A402; Wed, 24 Jan 2007 05:44:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D4E0C16A400 for ; Wed, 24 Jan 2007 05:44:43 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AB8A813C4A7 for ; Wed, 24 Jan 2007 05:44:43 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0O5ihCp068528 for ; Wed, 24 Jan 2007 05:44:43 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0O5ihhb068525 for perforce@freebsd.org; Wed, 24 Jan 2007 05:44:43 GMT (envelope-from kevlo@freebsd.org) Date: Wed, 24 Jan 2007 05:44:43 GMT Message-Id: <200701240544.l0O5ihhb068525@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 113473 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Jan 2007 05:44:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=113473 Change 113473 by kevlo@kevlo_rtsl on 2007/01/24 05:44:07 Fix comments Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_mem.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_mem.c#4 (text+ko) ==== @@ -47,8 +47,8 @@ static uint32_t sdram_64bit[] = { 0x00800000, /* 8M: One 2M x 32 chip */ 0x01000000, /* 16M: Two 2M x 32 chips */ - 0x01000000, /* 16M: One 4M x 32 chip */ - 0x02000000, /* 32M: Two 4M x 32 chips */ + 0x01000000, /* 16M: Two 4M x 16 chips */ + 0x02000000, /* 32M: Four 4M x 32 chips */ 0, 0, 0, 0 }; From owner-p4-projects@FreeBSD.ORG Wed Jan 24 11:49:18 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EBC3A16A40F; Wed, 24 Jan 2007 11:49:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A044016A40D for ; Wed, 24 Jan 2007 11:49:17 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 62C5213C4BF for ; Wed, 24 Jan 2007 11:49:17 +0000 (UTC) (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 l0OBnGOD052611 for ; Wed, 24 Jan 2007 11:49:16 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0OBnGSe052608 for perforce@freebsd.org; Wed, 24 Jan 2007 11:49:16 GMT (envelope-from bushman@freebsd.org) Date: Wed, 24 Jan 2007 11:49:16 GMT Message-Id: <200701241149.l0OBnGSe052608@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 113476 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Jan 2007 11:49:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=113476 Change 113476 by bushman@bushman_nss_ldap_cached on 2007/01/24 11:48:58 nss_ldap branched to allow it to be built as a port Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/port/Makefile#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/port/pkg-descr#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/port/pkg-plist#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/hashtable.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldap_group.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldap_group.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldap_passwd.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldap_passwd.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldap_serv.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldap_serv.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapconf.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapconf.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapconn.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapconn.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapschema.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapschema.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapsearch.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapsearch.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldaptls.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldaptls.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldaputil.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldaputil.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/nss_ldap.5#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/nss_ldap.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/nss_ldap.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jan 24 14:06:08 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49E2616A404; Wed, 24 Jan 2007 14:06:08 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1AF3216A403 for ; Wed, 24 Jan 2007 14:06:08 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0A6E913C45D for ; Wed, 24 Jan 2007 14:06:08 +0000 (UTC) (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 l0OE68SJ095209 for ; Wed, 24 Jan 2007 14:06:08 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0OE673p095206 for perforce@freebsd.org; Wed, 24 Jan 2007 14:06:07 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 24 Jan 2007 14:06:07 GMT Message-Id: <200701241406.l0OE673p095206@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 113478 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Jan 2007 14:06:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=113478 Change 113478 by hselasky@hselasky_mini_itx on 2007/01/24 14:05:37 Style changes: - s/iot/sc_io_tag/g - s/ioh/sc_io_hdl/g - s/sc_size/sc_io_size/g - s/ios/sc_io_size/g - s/irq_res/sc_irq_res/g - s/ih/sc_intr_hdl/g Ininitialized "sc_io_size". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci.c#20 edit .. //depot/projects/usb/src/sys/dev/usb/ehci.h#8 edit .. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.h#7 edit .. //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#13 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.h#7 edit .. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#12 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#20 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/ehci.h#8 (text+ko) ==== @@ -395,71 +395,62 @@ typedef struct ehci_softc { struct usbd_page sc_hw_page; - struct ehci_hw_softc *sc_hw_ptr; - - ehci_qh_t *sc_async_p_last; - ehci_qh_t *sc_intr_p_last[EHCI_VIRTUAL_FRAMELIST_COUNT]; - u_int16_t sc_intr_stat[EHCI_VIRTUAL_FRAMELIST_COUNT]; - ehci_sitd_t *sc_isoc_fs_p_last[EHCI_VIRTUAL_FRAMELIST_COUNT]; - ehci_itd_t *sc_isoc_hs_p_last[EHCI_VIRTUAL_FRAMELIST_COUNT]; struct usbd_bus sc_bus; /* base device */ + struct __callout sc_tmo_pcd; + LIST_HEAD(, usbd_xfer) sc_interrupt_list_head; - bus_space_tag_t iot; - bus_space_handle_t ioh; - bus_size_t sc_size; + struct ehci_hw_softc *sc_hw_ptr; + struct resource *sc_io_res; + struct resource *sc_irq_res; + struct usbd_xfer *sc_intrxfer; + struct ehci_qh *sc_async_p_last; + struct ehci_qh *sc_intr_p_last[EHCI_VIRTUAL_FRAMELIST_COUNT]; + struct ehci_sitd *sc_isoc_fs_p_last[EHCI_VIRTUAL_FRAMELIST_COUNT]; + struct ehci_itd *sc_isoc_hs_p_last[EHCI_VIRTUAL_FRAMELIST_COUNT]; + void *sc_intr_hdl; + device_t sc_dev; + bus_size_t sc_io_size; + bus_space_tag_t sc_io_tag; + bus_space_handle_t sc_io_hdl; - void *ih; + uint32_t sc_eintrs; + uint32_t sc_cmd; /* shadow of cmd register during suspend */ - struct resource *io_res; - struct resource *irq_res; + uint16_t sc_intr_stat[EHCI_VIRTUAL_FRAMELIST_COUNT]; + uint16_t sc_id_vendor; /* vendor ID for root hub */ - device_t sc_dev; - uint8_t sc_offs; /* offset to operational registers */ uint8_t sc_doorbell_disable; /* set on doorbell failure */ - - char sc_vendor[16]; /* vendor string for root hub */ - int sc_id_vendor; /* vendor ID for root hub */ - -#if defined(__NetBSD__) - void *sc_powerhook; /* cookie from power hook */ - void *sc_shutdownhook; /* cookie from shutdown hook */ -#endif - LIST_HEAD(, usbd_xfer) sc_interrupt_list_head; - uint8_t sc_noport; uint8_t sc_addr; /* device address */ uint8_t sc_conf; /* device configuration */ - struct usbd_xfer *sc_intrxfer; uint8_t sc_isreset; - uint32_t sc_eintrs; - uint32_t sc_cmd; /* shadow of cmd register during suspend */ + char sc_vendor[16]; /* vendor string for root hub */ - struct __callout sc_tmo_pcd; } ehci_softc_t; -#define EREAD1(sc, a) bus_space_read_1((sc)->iot, (sc)->ioh, (a)) -#define EREAD2(sc, a) bus_space_read_2((sc)->iot, (sc)->ioh, (a)) -#define EREAD4(sc, a) bus_space_read_4((sc)->iot, (sc)->ioh, (a)) +#define EREAD1(sc, a) bus_space_read_1((sc)->sc_io_tag, (sc)->sc_io_hdl, (a)) +#define EREAD2(sc, a) bus_space_read_2((sc)->sc_io_tag, (sc)->sc_io_hdl, (a)) +#define EREAD4(sc, a) bus_space_read_4((sc)->sc_io_tag, (sc)->sc_io_hdl, (a)) #define EWRITE1(sc, a, x) \ - bus_space_write_1((sc)->iot, (sc)->ioh, (a), (x)) + bus_space_write_1((sc)->sc_io_tag, (sc)->sc_io_hdl, (a), (x)) #define EWRITE2(sc, a, x) \ - bus_space_write_2((sc)->iot, (sc)->ioh, (a), (x)) + bus_space_write_2((sc)->sc_io_tag, (sc)->sc_io_hdl, (a), (x)) #define EWRITE4(sc, a, x) \ - bus_space_write_4((sc)->iot, (sc)->ioh, (a), (x)) + bus_space_write_4((sc)->sc_io_tag, (sc)->sc_io_hdl, (a), (x)) #define EOREAD1(sc, a) \ - bus_space_read_1((sc)->iot, (sc)->ioh, (sc)->sc_offs+(a)) + bus_space_read_1((sc)->sc_io_tag, (sc)->sc_io_hdl, (sc)->sc_offs+(a)) #define EOREAD2(sc, a) \ - bus_space_read_2((sc)->iot, (sc)->ioh, (sc)->sc_offs+(a)) + bus_space_read_2((sc)->sc_io_tag, (sc)->sc_io_hdl, (sc)->sc_offs+(a)) #define EOREAD4(sc, a) \ - bus_space_read_4((sc)->iot, (sc)->ioh, (sc)->sc_offs+(a)) + bus_space_read_4((sc)->sc_io_tag, (sc)->sc_io_hdl, (sc)->sc_offs+(a)) #define EOWRITE1(sc, a, x) \ - bus_space_write_1((sc)->iot, (sc)->ioh, (sc)->sc_offs+(a), (x)) + bus_space_write_1((sc)->sc_io_tag, (sc)->sc_io_hdl, (sc)->sc_offs+(a), (x)) #define EOWRITE2(sc, a, x) \ - bus_space_write_2((sc)->iot, (sc)->ioh, (sc)->sc_offs+(a), (x)) + bus_space_write_2((sc)->sc_io_tag, (sc)->sc_io_hdl, (sc)->sc_offs+(a), (x)) #define EOWRITE4(sc, a, x) \ - bus_space_write_4((sc)->iot, (sc)->ioh, (sc)->sc_offs+(a), (x)) + bus_space_write_4((sc)->sc_io_tag, (sc)->sc_io_hdl, (sc)->sc_offs+(a), (x)) usbd_status ehci_init(ehci_softc_t *sc); void ehci_detach(struct ehci_softc *sc); ==== //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#13 (text+ko) ==== @@ -262,21 +262,20 @@ } rid = PCI_CBMEM; - sc->io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, + sc->sc_io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, RF_ACTIVE); - if(!sc->io_res) - { + if (!sc->sc_io_res) { device_printf(self, "Could not map memory\n"); goto error; } - sc->iot = rman_get_bustag(sc->io_res); - sc->ioh = rman_get_bushandle(sc->io_res); + sc->sc_io_tag = rman_get_bustag(sc->sc_io_res); + sc->sc_io_hdl = rman_get_bushandle(sc->sc_io_res); + sc->sc_io_size = rman_get_size(sc->sc_io_res); rid = 0; - sc->irq_res = bus_alloc_resource_any(self, SYS_RES_IRQ, &rid, + sc->sc_irq_res = bus_alloc_resource_any(self, SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE); - if (sc->irq_res == NULL) - { + if (sc->sc_irq_res == NULL) { device_printf(self, "Could not allocate irq\n"); goto error; } @@ -338,12 +337,12 @@ sprintf(sc->sc_vendor, "(0x%04x)", pci_get_vendor(self)); } - err = bus_setup_intr(self, sc->irq_res, INTR_TYPE_BIO|INTR_MPSAFE, - (void *)(void *)ehci_interrupt, sc, &sc->ih); + err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO|INTR_MPSAFE, + (void *)(void *)ehci_interrupt, sc, &sc->sc_intr_hdl); if(err) { device_printf(self, "Could not setup irq, %d\n", err); - sc->ih = NULL; + sc->sc_intr_hdl = NULL; goto error; } @@ -384,34 +383,32 @@ /* * disable interrupts that might have been switched on in ehci_init */ - if(sc->io_res) - { - bus_space_write_4(sc->iot, sc->ioh, EHCI_USBINTR, 0); + if (sc->sc_io_res) { + EWRITE4(sc, EHCI_USBINTR, 0); } - if(sc->irq_res && sc->ih) - { + if (sc->sc_irq_res && sc->sc_intr_hdl) { /* only call ehci_detach() * after ehci_init() */ ehci_detach(sc); - int err = bus_teardown_intr(self, sc->irq_res, sc->ih); + int err = bus_teardown_intr(self, sc->sc_irq_res, sc->sc_intr_hdl); if (err) /* XXX or should we panic? */ device_printf(self, "Could not tear down irq, %d\n", err); - sc->ih = NULL; + sc->sc_intr_hdl = NULL; } - if (sc->irq_res) { - bus_release_resource(self, SYS_RES_IRQ, 0, sc->irq_res); - sc->irq_res = NULL; + if (sc->sc_irq_res) { + bus_release_resource(self, SYS_RES_IRQ, 0, sc->sc_irq_res); + sc->sc_irq_res = NULL; } - if (sc->io_res) { + if (sc->sc_io_res) { bus_release_resource(self, SYS_RES_MEMORY, PCI_CBMEM, - sc->io_res); - sc->io_res = NULL; + sc->sc_io_res); + sc->sc_io_res = NULL; } if (sc->sc_bus.dma_tag) { ==== //depot/projects/usb/src/sys/dev/usb/ohci.c#16 (text+ko) ==== @@ -95,17 +95,17 @@ static void ohci_dump_itds(ohci_itd_t *); #endif -#define OBARR(sc) bus_space_barrier((sc)->iot, (sc)->ioh, 0, (sc)->sc_size, \ +#define OBARR(sc) bus_space_barrier((sc)->sc_io_tag, (sc)->sc_io_hdl, 0, (sc)->sc_io_size, \ BUS_SPACE_BARRIER_READ|BUS_SPACE_BARRIER_WRITE) #define OWRITE1(sc, r, x) \ - do { OBARR(sc); bus_space_write_1((sc)->iot, (sc)->ioh, (r), (x)); } while (0) + do { OBARR(sc); bus_space_write_1((sc)->sc_io_tag, (sc)->sc_io_hdl, (r), (x)); } while (0) #define OWRITE2(sc, r, x) \ - do { OBARR(sc); bus_space_write_2((sc)->iot, (sc)->ioh, (r), (x)); } while (0) + do { OBARR(sc); bus_space_write_2((sc)->sc_io_tag, (sc)->sc_io_hdl, (r), (x)); } while (0) #define OWRITE4(sc, r, x) \ - do { OBARR(sc); bus_space_write_4((sc)->iot, (sc)->ioh, (r), (x)); } while (0) -#define OREAD1(sc, r) (OBARR(sc), bus_space_read_1((sc)->iot, (sc)->ioh, (r))) -#define OREAD2(sc, r) (OBARR(sc), bus_space_read_2((sc)->iot, (sc)->ioh, (r))) -#define OREAD4(sc, r) (OBARR(sc), bus_space_read_4((sc)->iot, (sc)->ioh, (r))) + do { OBARR(sc); bus_space_write_4((sc)->sc_io_tag, (sc)->sc_io_hdl, (r), (x)); } while (0) +#define OREAD1(sc, r) (OBARR(sc), bus_space_read_1((sc)->sc_io_tag, (sc)->sc_io_hdl, (r))) +#define OREAD2(sc, r) (OBARR(sc), bus_space_read_2((sc)->sc_io_tag, (sc)->sc_io_hdl, (r))) +#define OREAD4(sc, r) (OBARR(sc), bus_space_read_4((sc)->sc_io_tag, (sc)->sc_io_hdl, (r))) #define OHCI_INTR_ENDPT 1 ==== //depot/projects/usb/src/sys/dev/usb/ohci.h#7 (text+ko) ==== @@ -276,48 +276,37 @@ typedef struct ohci_softc { struct usbd_page sc_hw_page; - struct ohci_hw_softc *sc_hw_ptr; - - ohci_ed_t *sc_ctrl_p_last; - ohci_ed_t *sc_bulk_p_last; - ohci_ed_t *sc_isoc_p_last; - ohci_ed_t *sc_intr_p_last[OHCI_NO_EDS]; - uint16_t sc_intr_stat[OHCI_NO_EDS]; - struct usbd_bus sc_bus; /* base device */ - uint32_t sc_physaddr; + struct __callout sc_tmo_rhsc; + LIST_HEAD(, usbd_xfer) sc_interrupt_list_head; - bus_space_tag_t iot; - bus_space_handle_t ioh; - bus_size_t sc_size; + struct ohci_hw_softc *sc_hw_ptr; + struct usbd_xfer *sc_intrxfer; + struct resource *sc_io_res; + struct resource *sc_irq_res; + struct ohci_ed *sc_ctrl_p_last; + struct ohci_ed *sc_bulk_p_last; + struct ohci_ed *sc_isoc_p_last; + struct ohci_ed *sc_intr_p_last[OHCI_NO_EDS]; + void *sc_intr_hdl; + device_t sc_dev; + bus_size_t sc_io_size; + bus_space_tag_t sc_io_tag; + bus_space_handle_t sc_io_hdl; - void *ih; + uint32_t sc_eintrs; /* enabled interrupts */ + uint32_t sc_control; /* Preserved during suspend/standby */ + uint32_t sc_intre; - struct resource *io_res; - struct resource *irq_res; - - uint32_t sc_eintrs; /* enabled interrupts */ + uint16_t sc_intr_stat[OHCI_NO_EDS]; + uint16_t sc_id_vendor; uint8_t sc_noport; uint8_t sc_addr; /* device address */ uint8_t sc_conf; /* device configuration */ - device_t sc_dev; - - struct usbd_xfer *sc_intrxfer; + char sc_vendor[16]; - uint8_t sc_vendor[16]; - int sc_id_vendor; -#if defined(__NetBSD__) - void *sc_powerhook; /* cookie from power hook */ - void *sc_shutdownhook; /* cookie from shutdown hook */ -#endif - uint32_t sc_control; /* Preserved during suspend/standby */ - uint32_t sc_intre; - - LIST_HEAD(, usbd_xfer) sc_interrupt_list_head; - - struct __callout sc_tmo_rhsc; } ohci_softc_t; usbd_status ohci_init(ohci_softc_t *sc); ==== //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#13 (text+ko) ==== @@ -226,21 +226,20 @@ } rid = PCI_CBMEM; - sc->io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, + sc->sc_io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, RF_ACTIVE); - if(!sc->io_res) - { + if (!sc->sc_io_res) { device_printf(self, "Could not map memory\n"); goto error; } - sc->iot = rman_get_bustag(sc->io_res); - sc->ioh = rman_get_bushandle(sc->io_res); + sc->sc_io_tag = rman_get_bustag(sc->sc_io_res); + sc->sc_io_hdl = rman_get_bushandle(sc->sc_io_res); + sc->sc_io_size = rman_get_size(sc->sc_io_res); rid = 0; - sc->irq_res = bus_alloc_resource_any(self, SYS_RES_IRQ, &rid, + sc->sc_irq_res = bus_alloc_resource_any(self, SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE); - if(sc->irq_res == NULL) - { + if (sc->sc_irq_res == NULL) { device_printf(self, "Could not allocate irq\n"); goto error; } @@ -300,12 +299,12 @@ /* sc->sc_bus.usbrev; set by ohci_init() */ - err = bus_setup_intr(self, sc->irq_res, INTR_TYPE_BIO|INTR_MPSAFE, - (void *)(void *)ohci_interrupt, sc, &sc->ih); + err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO|INTR_MPSAFE, + (void *)(void *)ohci_interrupt, sc, &(sc->sc_intr_hdl)); if(err) { device_printf(self, "Could not setup irq, %d\n", err); - sc->ih = NULL; + sc->sc_intr_hdl = NULL; goto error; } @@ -344,14 +343,13 @@ pci_disable_busmaster(self); - if(sc->irq_res && sc->ih) - { + if(sc->sc_irq_res && sc->sc_intr_hdl) { /* only call ohci_detach() * after ohci_init() */ ohci_detach(sc); - int err = bus_teardown_intr(self, sc->irq_res, sc->ih); + int err = bus_teardown_intr(self, sc->sc_irq_res, sc->sc_intr_hdl); if(err) { @@ -359,18 +357,18 @@ device_printf(self, "Could not tear down irq, %d\n", err); } - sc->ih = NULL; + sc->sc_intr_hdl = NULL; } - if(sc->irq_res) - { - bus_release_resource(self, SYS_RES_IRQ, 0, sc->irq_res); - sc->irq_res = NULL; + + if (sc->sc_irq_res) { + bus_release_resource(self, SYS_RES_IRQ, 0, sc->sc_irq_res); + sc->sc_irq_res = NULL; } - if(sc->io_res) - { + + if (sc->sc_io_res) { bus_release_resource(self, SYS_RES_MEMORY, PCI_CBMEM, - sc->io_res); - sc->io_res = NULL; + sc->sc_io_res); + sc->sc_io_res = NULL; } if(sc->sc_bus.dma_tag) ==== //depot/projects/usb/src/sys/dev/usb/uhci.c#17 (text+ko) ==== @@ -98,21 +98,20 @@ uhci_dump_tds(uhci_td_t *td); #endif -/* NOTE: ``(sc)->ios'' is not setup */ -#define UBARR(sc) bus_space_barrier((sc)->iot, (sc)->ioh, 0, (sc)->ios, \ +#define UBARR(sc) bus_space_barrier((sc)->sc_io_tag, (sc)->sc_io_hdl, 0, (sc)->sc_io_size, \ BUS_SPACE_BARRIER_READ|BUS_SPACE_BARRIER_WRITE) #define UWRITE1(sc, r, x) \ - do { UBARR(sc); bus_space_write_1((sc)->iot, (sc)->ioh, (r), (x)); \ + do { UBARR(sc); bus_space_write_1((sc)->sc_io_tag, (sc)->sc_io_hdl, (r), (x)); \ } while (/*CONSTCOND*/0) #define UWRITE2(sc, r, x) \ - do { UBARR(sc); bus_space_write_2((sc)->iot, (sc)->ioh, (r), (x)); \ + do { UBARR(sc); bus_space_write_2((sc)->sc_io_tag, (sc)->sc_io_hdl, (r), (x)); \ } while (/*CONSTCOND*/0) #define UWRITE4(sc, r, x) \ - do { UBARR(sc); bus_space_write_4((sc)->iot, (sc)->ioh, (r), (x)); \ + do { UBARR(sc); bus_space_write_4((sc)->sc_io_tag, (sc)->sc_io_hdl, (r), (x)); \ } while (/*CONSTCOND*/0) -#define UREAD1(sc, r) (UBARR(sc), bus_space_read_1((sc)->iot, (sc)->ioh, (r))) -#define UREAD2(sc, r) (UBARR(sc), bus_space_read_2((sc)->iot, (sc)->ioh, (r))) -#define UREAD4(sc, r) (UBARR(sc), bus_space_read_4((sc)->iot, (sc)->ioh, (r))) +#define UREAD1(sc, r) (UBARR(sc), bus_space_read_1((sc)->sc_io_tag, (sc)->sc_io_hdl, (r))) +#define UREAD2(sc, r) (UBARR(sc), bus_space_read_2((sc)->sc_io_tag, (sc)->sc_io_hdl, (r))) +#define UREAD4(sc, r) (UBARR(sc), bus_space_read_4((sc)->sc_io_tag, (sc)->sc_io_hdl, (r))) #define UHCICMD(sc, cmd) UWRITE2(sc, UHCI_CMD, cmd) #define UHCISTS(sc) UREAD2(sc, UHCI_STS) ==== //depot/projects/usb/src/sys/dev/usb/uhci.h#7 (text+ko) ==== @@ -236,39 +236,32 @@ typedef struct uhci_softc { struct usbd_page sc_hw_page; + struct usbd_bus sc_bus; /* base device */ + LIST_HEAD(, usbd_xfer) sc_interrupt_list_head; + struct uhci_hw_softc *sc_hw_ptr; - struct uhci_td *sc_isoc_p_last[UHCI_VFRAMELIST_COUNT]; /* pointer to last TD for isochronous */ struct uhci_qh *sc_intr_p_last[UHCI_IFRAMELIST_COUNT]; /* pointer to last QH for interrupt */ - - uint16_t sc_intr_stat[UHCI_IFRAMELIST_COUNT]; - struct uhci_qh *sc_ls_ctl_p_last; /* pointer to last QH for low speed control */ struct uhci_qh *sc_hs_ctl_p_last; /* pointer to last QH for high speed control */ struct uhci_qh *sc_bulk_p_last; /* pointer to last QH for bulk */ + struct resource *sc_io_res; + struct resource *sc_irq_res; + void *sc_intr_hdl; + device_t sc_dev; + bus_size_t sc_io_size; + bus_space_tag_t sc_io_tag; + bus_space_handle_t sc_io_hdl; - struct usbd_bus sc_bus; /* base device */ + uint32_t sc_loops; /* number of QHs that wants looping */ - bus_space_tag_t iot; - bus_space_handle_t ioh; - bus_size_t ios; - - void *ih; - - struct resource *io_res; - struct resource *irq_res; - - device_t sc_dev; + uint16_t sc_intr_stat[UHCI_IFRAMELIST_COUNT]; + uint16_t sc_saved_frnum; - uint32_t sc_loops; /* number of QHs that wants looping */ uint8_t sc_addr; /* device address */ uint8_t sc_conf; /* device configuration */ uint8_t sc_isreset; - uint8_t sc_saved_sof; - uint16_t sc_saved_frnum; - - LIST_HEAD(, usbd_xfer) sc_interrupt_list_head; char sc_vendor[16]; /* vendor string for root hub */ } uhci_softc_t; ==== //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#12 (text+ko) ==== @@ -225,24 +225,23 @@ } rid = PCI_UHCI_BASE_REG; - sc->io_res = bus_alloc_resource_any(self, SYS_RES_IOPORT, &rid, + sc->sc_io_res = bus_alloc_resource_any(self, SYS_RES_IOPORT, &rid, RF_ACTIVE); - if(!sc->io_res) - { + if (!sc->sc_io_res) { device_printf(self, "Could not map ports\n"); goto error; } - sc->iot = rman_get_bustag(sc->io_res); - sc->ioh = rman_get_bushandle(sc->io_res); + sc->sc_io_tag = rman_get_bustag(sc->sc_io_res); + sc->sc_io_hdl = rman_get_bushandle(sc->sc_io_res); + sc->sc_io_size = rman_get_size(sc->sc_io_res); /* disable interrupts */ - bus_space_write_2(sc->iot, sc->ioh, UHCI_INTR, 0); + bus_space_write_2(sc->sc_io_tag, sc->sc_io_hdl, UHCI_INTR, 0); rid = 0; - sc->irq_res = bus_alloc_resource_any(self, SYS_RES_IRQ, &rid, + sc->sc_irq_res = bus_alloc_resource_any(self, SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE); - if(sc->irq_res == NULL) - { + if (sc->sc_irq_res == NULL) { device_printf(self, "Could not allocate irq\n"); goto error; } @@ -286,13 +285,13 @@ break; } - err = bus_setup_intr(self, sc->irq_res, INTR_TYPE_BIO|INTR_MPSAFE, - (void *)(void *)uhci_interrupt, sc, &sc->ih); + err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO|INTR_MPSAFE, + (void *)(void *)uhci_interrupt, sc, &(sc->sc_intr_hdl)); if(err) { device_printf(self, "Could not setup irq, %d\n", err); - sc->ih = NULL; + sc->sc_intr_hdl = NULL; goto error; } /* @@ -346,8 +345,7 @@ * disable interrupts that might have been switched on in * uhci_init. */ - if(sc->io_res) - { + if (sc->sc_io_res) { mtx_lock(&sc->sc_bus.mtx); /* stop the controller */ @@ -358,9 +356,8 @@ pci_disable_busmaster(self); - if(sc->irq_res && sc->ih) - { - int err = bus_teardown_intr(self, sc->irq_res, sc->ih); + if (sc->sc_irq_res && sc->sc_intr_hdl) { + int err = bus_teardown_intr(self, sc->sc_irq_res, sc->sc_intr_hdl); if(err) { @@ -368,18 +365,18 @@ device_printf(self, "Could not tear down irq, %d\n", err); } - sc->ih = NULL; + sc->sc_intr_hdl = NULL; } - if(sc->irq_res) - { - bus_release_resource(self, SYS_RES_IRQ, 0, sc->irq_res); - sc->irq_res = NULL; + + if (sc->sc_irq_res) { + bus_release_resource(self, SYS_RES_IRQ, 0, sc->sc_irq_res); + sc->sc_irq_res = NULL; } - if(sc->io_res) - { + + if(sc->sc_io_res) { bus_release_resource(self, SYS_RES_IOPORT, PCI_UHCI_BASE_REG, - sc->io_res); - sc->io_res = NULL; + sc->sc_io_res); + sc->sc_io_res = NULL; } if(sc->sc_bus.dma_tag) From owner-p4-projects@FreeBSD.ORG Wed Jan 24 14:11:15 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52ACB16A404; Wed, 24 Jan 2007 14:11:15 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2896D16A402 for ; Wed, 24 Jan 2007 14:11:15 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 19C1E13C441 for ; Wed, 24 Jan 2007 14:11:15 +0000 (UTC) (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 l0OEBEVM095757 for ; Wed, 24 Jan 2007 14:11:14 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0OEBEwa095741 for perforce@freebsd.org; Wed, 24 Jan 2007 14:11:14 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 24 Jan 2007 14:11:14 GMT Message-Id: <200701241411.l0OEBEwa095741@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 113479 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Jan 2007 14:11:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=113479 Change 113479 by hselasky@hselasky_mini_itx on 2007/01/24 14:11:06 Forgot to mention: Reorder of all USB host controller softc structures, so that highest alignment structures are first, and lower alignment structures come later. See change 113478. This should give better memory packing on architectures where integer access must be aligned. Removed some unused fields. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci.c#21 edit .. //depot/projects/usb/src/sys/dev/usb/ehci.h#9 edit .. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.h#8 edit .. //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#14 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.h#8 edit .. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#13 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#21 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/ehci.h#9 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#14 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/ohci.c#17 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/ohci.h#8 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#14 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/uhci.c#18 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/uhci.h#8 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#13 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Jan 24 15:02:19 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56D5216A482; Wed, 24 Jan 2007 15:02:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 01C7216A47C for ; Wed, 24 Jan 2007 15:02:19 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E749D13C4B8 for ; Wed, 24 Jan 2007 15:02:18 +0000 (UTC) (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 l0OF2IIC006735 for ; Wed, 24 Jan 2007 15:02:18 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0OF2Ieb006732 for perforce@freebsd.org; Wed, 24 Jan 2007 15:02:18 GMT (envelope-from bushman@freebsd.org) Date: Wed, 24 Jan 2007 15:02:18 GMT Message-Id: <200701241502.l0OF2Ieb006732@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 113480 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Jan 2007 15:02:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=113480 Change 113480 by bushman@bushman_nss_ldap_cached on 2007/01/24 15:01:17 build_port.sh addes, which facilitates nss_ldap_bsd port making some port-specific changes in the nss_ldap Makefile Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/build_port.sh#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/Makefile#2 edit .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/nss_ldap.5#2 delete .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/nss_ldap_bsd.5#1 branch Differences ... ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/Makefile#2 (text+ko) ==== @@ -2,26 +2,29 @@ .include -LIB= nss_ldap +LIB= nss_ldap_bsd SHLIB_MAJOR= 1 -SHLIB_NAME= nss_ldap.so.${SHLIB_MAJOR} -SHLIBDIR?= /lib +SHLIB_NAME= nss_ldap_bsd.so.${SHLIB_MAJOR} +SHLIBDIR?= ${PREFIX}/lib +LIBDIR= ${PREFIX}/lib +MANDIR?= ${PREFIX}/man/man 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+=-DINET6 +CFLAGS+=-DINET6 -I${PREFIX]/include\ + -DNSS_LDAP_CONF_PATH=\"${PREFIX}/etc/nss_ldap.conf\" +LDFLAGS+= -L${PREFIX}/lib LDADD+= -lldap -.if ${MK_OPENSSL} != "no" CFLAGS+= -DNSS_LDAP_START_TLS_ENABLED -DNSS_LDAP_SSL_ENABLED -.endif -CFLAGS+= ${OPENLDAP_CFLAGS} -LDFLAGS+= ${OPENLDAP_LDFLAGS} -LDADD+= ${OPENLDAP_LDADD} +USE_OPENSSL= yes +USE_OPENLDAP= yes +WANT_OPENLDAP_SASL= yes INCS= -MAN= nss_ldap.5 +MAN= nss_ldap_bsd.5 +NO_MANCOMPRESS= .include From owner-p4-projects@FreeBSD.ORG Wed Jan 24 21:04:53 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5471716A405; Wed, 24 Jan 2007 21:04:53 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 180C516A401 for ; Wed, 24 Jan 2007 21:04:53 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 09F3513C47E for ; Wed, 24 Jan 2007 21:04:53 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0OL4qT6000593 for ; Wed, 24 Jan 2007 21:04:52 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0OL4qYZ000586 for perforce@freebsd.org; Wed, 24 Jan 2007 21:04:52 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 24 Jan 2007 21:04:52 GMT Message-Id: <200701242104.l0OL4qYZ000586@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 113483 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Jan 2007 21:04:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=113483 Change 113483 by zec@zec_tca51 on 2007/01/24 21:04:11 Rearrange the location of the "snd_limited" field in struct tcpcb so that enough room can be create to accomodate a pointer to struct vnet without introducing any churn to other field's position nor the size of struct tcpcb. This allows vnet_tbl[] to be nuked... Don't link a newly created vnet to a list of all vnets before it has been completely initialized. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#13 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#8 edit .. //depot/projects/vimage/src/sys/netinet/tcp_timer.c#6 edit .. //depot/projects/vimage/src/sys/netinet/tcp_var.h#3 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#12 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#13 (text+ko) ==== @@ -68,8 +68,6 @@ struct vcpu vcpu_0; struct vnet_base vnetb_0; -struct vnet_base *vnetb_tbl[100]; /* XXX used in struct tcb */ - struct vimage_list_head vimage_head; struct vnetb_list_head vnetb_head; struct vprocg_list_head vprocg_head; @@ -394,13 +392,16 @@ struct vprocg *vprocg; struct vcpu *vcpu; struct domain *dp; - int i; + + /* + * XXX don't forget the locking + */ printf("vi_alloc: %s\n", name); /* A brute force check whether there's enough mem for a new vimage */ vip = malloc(127*1024, M_VIMAGE, M_NOWAIT); /* XXX aaaargh... */ if (vip == NULL) - return NULL; + goto vi_alloc_done; vip = realloc(vip, sizeof(struct vimage), M_VIMAGE, M_NOWAIT); if (vip == NULL) @@ -414,12 +415,6 @@ bzero(vnetb, sizeof(struct vnet_base)); vip->v_vnetb = vnetb; vnetb->vnet_magic_n = VNET_MAGIC_N; - for (i = 0; i < 100; i++) /* XXX !!! */ - if (vnetb_tbl[i] == NULL) { - vnetb->vnet_id = i; - vnetb_tbl[i] = vnetb; - break; - } vprocg = malloc(sizeof(struct vprocg), M_VPROCG, M_NOWAIT); if (vprocg == NULL) @@ -436,14 +431,6 @@ /* Some initialization stuff... */ sprintf(vip->vi_name, "%s", name); - /* - * XXX don't forget locking -> - * is it really needed given that the timers are giant-protected? - */ - LIST_INSERT_HEAD(&vimage_head, vip, vi_le); - LIST_INSERT_HEAD(&vnetb_head, vnetb, vnetb_le); - LIST_INSERT_HEAD(&vprocg_head, vprocg, vprocg_le); - LIST_INSERT_HEAD(&vcpu_head, vcpu, vcpu_le); CURVNETB_SET_QUIET(vnetb); /* @@ -487,8 +474,14 @@ } CURVNETB_RESTORE(); + + LIST_INSERT_HEAD(&vimage_head, vip, vi_le); + LIST_INSERT_HEAD(&vnetb_head, vnetb, vnetb_le); + LIST_INSERT_HEAD(&vprocg_head, vprocg, vprocg_le); + LIST_INSERT_HEAD(&vcpu_head, vcpu, vcpu_le); printf("done.\n"); +vi_alloc_done: return (vip); } @@ -568,9 +561,6 @@ vimage_0.v_procg = &vprocg_0; vimage_0.v_cpu = &vcpu_0; - vnetb_0.vnet_id = 1; /* XXX */ - vnetb_tbl[0] = (void *) 0xc0dedead; /* XXX */ - vnetb_tbl[1] = &vnetb_0; /* XXX */ vnetb_0.vnet_magic_n = VNET_MAGIC_N; TAILQ_INIT(&vnet_modlink_head); ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#8 (text+ko) ==== @@ -189,16 +189,17 @@ static int tcptw_auto_size(void) { + INIT_VNET_INET(curvnetb); int halfrange; /* * Max out at half the ephemeral port range so that TIME_WAIT * sockets don't tie up too many ephemeral ports. */ - if (ipport_lastauto > ipport_firstauto) - halfrange = (ipport_lastauto - ipport_firstauto) / 2; + if (V_ipport_lastauto > V_ipport_firstauto) + halfrange = (V_ipport_lastauto - V_ipport_firstauto) / 2; else - halfrange = (ipport_firstauto - ipport_lastauto) / 2; + halfrange = (V_ipport_firstauto - V_ipport_lastauto) / 2; /* Protect against goofy port ranges smaller than 32. */ return (imin(imax(halfrange, 32), maxsockets / 5)); } @@ -686,7 +687,7 @@ return (NULL); tp = &tm->tcb; #ifdef VIMAGE - tp->vnet_id = inp->inp_vnetb->vnet_id; + tp->t_vnetb = inp->inp_vnetb; #endif /* LIST_INIT(&tp->t_segq); */ /* XXX covered by M_ZERO */ tp->t_maxseg = tp->t_maxopd = ==== //depot/projects/vimage/src/sys/netinet/tcp_timer.c#6 (text+ko) ==== @@ -145,8 +145,8 @@ { struct tcpcb *tp = xtp; struct inpcb *inp; - CURVNETB_SET(vnetb_tbl[tp->vnet_id]); - INIT_VNET_INET(vnetb_tbl[tp->vnet_id]); + CURVNETB_SET(tp->t_vnetb); + INIT_VNET_INET(tp->t_vnetb); INP_INFO_RLOCK(&V_tcbinfo); inp = tp->t_inpcb; @@ -187,8 +187,8 @@ { struct tcpcb *tp = xtp; struct inpcb *inp; - CURVNETB_SET(vnetb_tbl[tp->vnet_id]); - INIT_VNET_INET(vnetb_tbl[tp->vnet_id]); + CURVNETB_SET(tp->t_vnetb); + INIT_VNET_INET(tp->t_vnetb); #ifdef TCPDEBUG int ostate; @@ -313,8 +313,8 @@ struct tcpcb *tp = xtp; struct tcptemp *t_template; struct inpcb *inp; - CURVNETB_SET(vnetb_tbl[tp->vnet_id]); - INIT_VNET_INET(vnetb_tbl[tp->vnet_id]); + CURVNETB_SET(tp->t_vnetb); + INIT_VNET_INET(tp->t_vnetb); #ifdef TCPDEBUG int ostate; @@ -411,8 +411,8 @@ { struct tcpcb *tp = xtp; struct inpcb *inp; - CURVNETB_SET(vnetb_tbl[tp->vnet_id]); - INIT_VNET_INET(vnetb_tbl[tp->vnet_id]); + CURVNETB_SET(tp->t_vnetb); + INIT_VNET_INET(tp->t_vnetb); #ifdef TCPDEBUG int ostate; @@ -486,8 +486,8 @@ int rexmt; int headlocked; struct inpcb *inp; - CURVNETB_SET(vnetb_tbl[tp->vnet_id]); - INIT_VNET_INET(vnetb_tbl[tp->vnet_id]); + CURVNETB_SET(tp->t_vnetb); + INIT_VNET_INET(tp->t_vnetb); #ifdef TCPDEBUG int ostate; ==== //depot/projects/vimage/src/sys/netinet/tcp_var.h#3 (text+ko) ==== @@ -177,6 +177,7 @@ u_char rcv_scale; /* window scaling for recv window */ u_char request_r_scale; /* pending window scaling */ u_char requested_s_scale; /* unused, to be reused later */ + u_char snd_limited; /* segments limited transmitted */ u_int32_t ts_recent; /* timestamp echo data */ u_long ts_recent_age; /* when last updated */ u_int32_t ts_offset; /* our timestamp offset */ @@ -187,8 +188,7 @@ u_long snd_ssthresh_prev; /* ssthresh prior to retransmit */ tcp_seq snd_recover_prev; /* snd_recover prior to retransmit */ u_long t_badrxtwin; /* window for retransmit recovery */ - u_char snd_limited; /* segments limited transmitted */ - u_short vnet_id; /* index to vnetb_table */ + struct vnet_base *t_vnetb; /* back pointer to parent vnet */ /* anti DoS counters */ u_long rcv_second; /* start of interval second */ u_long rcv_pps; /* received packets per second */ ==== //depot/projects/vimage/src/sys/sys/vimage.h#12 (text+ko) ==== @@ -88,8 +88,6 @@ int ifccnt; int sockcnt; - int vnet_id; /* index to vnetb_tbl */ - int vnet_magic_n; }; @@ -226,8 +224,6 @@ LIST_HEAD(vnetb_list_head, vnet_base); extern struct vnetb_list_head vnetb_head; -extern struct vnet_base *vnetb_tbl[]; /* XXX hack used in tcb */ - /* * XXX The stuff bellow needs a major cleanup / rewrite from scratch. From owner-p4-projects@FreeBSD.ORG Wed Jan 24 22:47:01 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F36C116A402; Wed, 24 Jan 2007 22:47:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AB36D16A400 for ; Wed, 24 Jan 2007 22:47:00 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9D63113C441 for ; Wed, 24 Jan 2007 22:47:00 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0OMl0R7017997 for ; Wed, 24 Jan 2007 22:47:00 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0OMl0i4017992 for perforce@freebsd.org; Wed, 24 Jan 2007 22:47:00 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 24 Jan 2007 22:47:00 GMT Message-Id: <200701242247.l0OMl0i4017992@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 113484 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Jan 2007 22:47:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=113484 Change 113484 by zec@zec_tca51 on 2007/01/24 22:46:29 Back out a few bits leaked from an uncommited set of changes. Affected files ... .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#9 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#9 (text+ko) ==== @@ -189,17 +189,16 @@ static int tcptw_auto_size(void) { - INIT_VNET_INET(curvnetb); int halfrange; /* * Max out at half the ephemeral port range so that TIME_WAIT * sockets don't tie up too many ephemeral ports. */ - if (V_ipport_lastauto > V_ipport_firstauto) - halfrange = (V_ipport_lastauto - V_ipport_firstauto) / 2; + if (ipport_lastauto > ipport_firstauto) + halfrange = (ipport_lastauto - ipport_firstauto) / 2; else - halfrange = (V_ipport_firstauto - V_ipport_lastauto) / 2; + halfrange = (ipport_firstauto - ipport_lastauto) / 2; /* Protect against goofy port ranges smaller than 32. */ return (imin(imax(halfrange, 32), maxsockets / 5)); } From owner-p4-projects@FreeBSD.ORG Thu Jan 25 06:14:16 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C827916A404; Thu, 25 Jan 2007 06:14:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 87DDC16A400 for ; Thu, 25 Jan 2007 06:14:16 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 61C5D13C47E for ; Thu, 25 Jan 2007 06:14:16 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0P6EGDJ015656 for ; Thu, 25 Jan 2007 06:14:16 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0P6EGGi015649 for perforce@freebsd.org; Thu, 25 Jan 2007 06:14:16 GMT (envelope-from mjacob@freebsd.org) Date: Thu, 25 Jan 2007 06:14:16 GMT Message-Id: <200701250614.l0P6EGGi015649@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 113488 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2007 06:14:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=113488 Change 113488 by mjacob@mjexp-obrien on 2007/01/25 06:13:51 Remember to make multipath subdirectory. Affected files ... .. //depot/projects/mjexp/etc/mtree/BSD.include.dist#4 edit Differences ... ==== //depot/projects/mjexp/etc/mtree/BSD.include.dist#4 (text+ko) ==== @@ -114,6 +114,8 @@ .. mirror .. + multipath + .. nop .. raid3 From owner-p4-projects@FreeBSD.ORG Thu Jan 25 13:59:06 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCC9C16A403; Thu, 25 Jan 2007 13:59:05 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A6B8B16A400 for ; Thu, 25 Jan 2007 13:59:05 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 972E113C44B for ; Thu, 25 Jan 2007 13:59:05 +0000 (UTC) (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 l0PDx5jv033715 for ; Thu, 25 Jan 2007 13:59:05 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0PDx5Xo033712 for perforce@freebsd.org; Thu, 25 Jan 2007 13:59:05 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 25 Jan 2007 13:59:05 GMT Message-Id: <200701251359.l0PDx5Xo033712@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 113499 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2007 13:59:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=113499 Change 113499 by rdivacky@rdivacky_witten on 2007/01/25 13:58:16 Introduce some more SO_ option equivalents from linux to FreeBSD. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#15 edit .. //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#11 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux.h#12 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#15 (text+ko) ==== @@ -674,6 +674,12 @@ #define LINUX_SO_PRIORITY 12 #define LINUX_SO_LINGER 13 #define LINUX_SO_PEERCRED 17 +#define LINUX_SO_RCVLOWAT 18 +#define LINUX_SO_SNDLOWAT 19 +#define LINUX_SO_RCVTIMEO 20 +#define LINUX_SO_SNDTIMEO 21 +#define LINUX_SO_TIMESTAMP 29 +#define LINUX_SO_ACCEPTCONN 30 #define LINUX_IP_TOS 1 #define LINUX_IP_TTL 2 ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#11 (text+ko) ==== @@ -296,6 +296,18 @@ return (SO_LINGER); case LINUX_SO_PEERCRED: return (LOCAL_PEERCRED); + case LINUX_SO_RCVLOWAT: + return (SO_RCVLOWAT); + case LINUX_SO_SNDLOWAT: + return (SO_SNDLOWAT); + case LINUX_SO_RCVTIMEO: + return (SO_RCVTIMEO); + case LINUX_SO_SNDTIMEO: + return (SO_SNDTIMEO); + case LINUX_SO_TIMESTAMP: + return (SO_TIMESTAMP); + case LINUX_SO_ACCEPTCONN: + return (SO_ACCEPTCONN); } return (-1); } ==== //depot/projects/linuxolator/src/sys/i386/linux/linux.h#12 (text+ko) ==== @@ -645,6 +645,12 @@ #define LINUX_SO_PRIORITY 12 #define LINUX_SO_LINGER 13 #define LINUX_SO_PEERCRED 17 +#define LINUX_SO_RCVLOWAT 18 +#define LINUX_SO_SNDLOWAT 19 +#define LINUX_SO_RCVTIMEO 20 +#define LINUX_SO_SNDTIMEO 21 +#define LINUX_SO_TIMESTAMP 29 +#define LINUX_SO_ACCEPTCONN 30 #define LINUX_IP_TOS 1 #define LINUX_IP_TTL 2 From owner-p4-projects@FreeBSD.ORG Thu Jan 25 14:00:12 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C11FA16A403; Thu, 25 Jan 2007 14:00:07 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9D58416A401 for ; Thu, 25 Jan 2007 14:00:07 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 783E513C44C for ; Thu, 25 Jan 2007 14:00:07 +0000 (UTC) (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 l0PE0791033764 for ; Thu, 25 Jan 2007 14:00:07 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0PE07Sh033761 for perforce@freebsd.org; Thu, 25 Jan 2007 14:00:07 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 25 Jan 2007 14:00:07 GMT Message-Id: <200701251400.l0PE07Sh033761@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 113500 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2007 14:00:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=113500 Change 113500 by rdivacky@rdivacky_witten on 2007/01/25 13:59:54 Make linux_mmap compilable with DEBUG after jkim's mmap commit. Affected files ... .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#22 edit Differences ... ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#22 (text+ko) ==== @@ -605,7 +605,7 @@ if (ldebug(mmap)) printf(ARGS(mmap, "%p, %d, %d, 0x%08x, %d, %d"), (void *)linux_args.addr, linux_args.len, linux_args.prot, - linux_args.flags, linux_args.fd, linux_args.pos); + linux_args.flags, linux_args.fd, linux_args.pgoff); #endif return (linux_mmap_common(td, &linux_args)); From owner-p4-projects@FreeBSD.ORG Thu Jan 25 14:48:08 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9EC2F16A407; Thu, 25 Jan 2007 14:48:08 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6152D16A405 for ; Thu, 25 Jan 2007 14:48:08 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5184D13C45E for ; Thu, 25 Jan 2007 14:48:08 +0000 (UTC) (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 l0PEm8ZN046523 for ; Thu, 25 Jan 2007 14:48:08 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0PEm8kw046505 for perforce@freebsd.org; Thu, 25 Jan 2007 14:48:08 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 25 Jan 2007 14:48:08 GMT Message-Id: <200701251448.l0PEm8kw046505@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 113503 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2007 14:48:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=113503 Change 113503 by rdivacky@rdivacky_witten on 2007/01/25 14:47:39 linux_sendmsg - if userspace passes us msg.msg_control && msg.msg_controllen == 0 set the controllen to 1 linux_recvmsg - we use msg but never load anything into it. I wonder how this could ever work. copyin the msg from userspace before doing anything with msg. Both this needs some checking as I dont understand the networking code but I didnt notice any obvious ill effects and this enables (+previous commit) ping to work from within linux chroot. Affected files ... .. //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#12 edit Differences ... ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#12 (text+ko) ==== @@ -1027,6 +1027,15 @@ if (error) return (error); error = copyin(PTRIN(linux_args.msg), &msg, sizeof(msg)); + + /* + * Ping on linux does pass 0 in controllen which is forbidden + * by FreeBSD but seems to be ok on Linux. This needs some + * checking but now it lets ping work. + */ + if (msg.msg_control && msg.msg_controllen == 0) + msg.msg_controllen = sizeof(struct cmsghdr); + if (error) return (error); error = copyiniov(msg.msg_iov, msg.msg_iovlen, &iov, EMSGSIZE); @@ -1064,6 +1073,9 @@ if ((error = copyin(args, &linux_args, sizeof(linux_args)))) return (error); + if ((error = copyin(PTRIN(args->msg), &msg, sizeof (msg)))) + return (error); + bsd_args.s = linux_args.s; bsd_args.msg = PTRIN(linux_args.msg); bsd_args.flags = linux_to_bsd_msg_flags(linux_args.flags); From owner-p4-projects@FreeBSD.ORG Thu Jan 25 15:04:30 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 407B416A403; Thu, 25 Jan 2007 15:04:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1215816A401 for ; Thu, 25 Jan 2007 15:04:30 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EAEA113C43E for ; Thu, 25 Jan 2007 15:04:29 +0000 (UTC) (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 l0PF4Tf0052425 for ; Thu, 25 Jan 2007 15:04:29 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0PF4TNd052419 for perforce@freebsd.org; Thu, 25 Jan 2007 15:04:29 GMT (envelope-from millert@freebsd.org) Date: Thu, 25 Jan 2007 15:04:29 GMT Message-Id: <200701251504.l0PF4TNd052419@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 113505 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2007 15:04:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=113505 Change 113505 by millert@millert_macbook on 2007/01/25 15:03:29 Pass in a struct componentname * to some more vfs entrypoints where it is available. We could add more if we are willing to move some nameidone() calls in the vendor sources. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_attrlist.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_syscalls.c#22 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#39 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#47 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#26 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#78 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_attrlist.c#6 (text+ko) ==== @@ -697,15 +697,15 @@ */ if (perms & W_OK) if (mac_vnode_check_access(vfs_context_ucred(ctx), - vp, W_OK) != 0) + vp, cnp, W_OK) != 0) perms &= ~W_OK; if (perms & R_OK) if (mac_vnode_check_access(vfs_context_ucred(ctx), - vp, R_OK) != 0) + vp, cnp, R_OK) != 0) perms &= ~R_OK; if (perms & X_OK) if (mac_vnode_check_access(vfs_context_ucred(ctx), - vp, X_OK) != 0) + vp, cnp, X_OK) != 0) perms &= ~X_OK; #endif /* MAC */ KAUTH_DEBUG("ATTRLIST - returning user access %x", perms); @@ -1195,15 +1195,15 @@ */ if (perms & W_OK) if (mac_vnode_check_access(vfs_context_ucred(&context), - vp, W_OK) != 0) + vp, cnp, W_OK) != 0) perms &= ~W_OK; if (perms & R_OK) if (mac_vnode_check_access(vfs_context_ucred(&context), - vp, R_OK) != 0) + vp, cnp, R_OK) != 0) perms &= ~R_OK; if (perms & X_OK) if (mac_vnode_check_access(vfs_context_ucred(&context), - vp, X_OK) != 0) + vp, cnp, X_OK) != 0) perms &= ~X_OK; #endif /* MAC */ VFS_DEBUG(ctx, vp, "ATTRLIST - granting perms %d", perms); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/vfs/vfs_syscalls.c#22 (text+ko) ==== @@ -376,7 +376,7 @@ } #ifdef MAC error = mac_mount_check_mount(vfs_context_ucred(&context), vp, - vfsp->vfc_name); + &nd.ni_cnd, vfsp->vfc_name); if (error != 0) goto out1; #endif @@ -1608,7 +1608,8 @@ return (error); #ifdef MAC - error = mac_vnode_check_chroot(vfs_context_ucred(&context), nd.ni_vp); + error = mac_vnode_check_chroot(vfs_context_ucred(&context), nd.ni_vp, + &nd.ni_cnd); if (error) { vnode_put(nd.ni_vp); return (error); @@ -2540,7 +2541,8 @@ * Check access permissions. */ static int -access1(vnode_t vp, vnode_t dvp, int uflags, vfs_context_t ctx) +access1(vnode_t vp, vnode_t dvp, struct component *cnp, int uflags, + vfs_context_t ctx) { kauth_action_t action; int error; @@ -2575,7 +2577,7 @@ } #ifdef MAC - error = mac_vnode_check_access(vfs_context_ucred(ctx), vp, uflags); + error = mac_vnode_check_access(vfs_context_ucred(ctx), vp, cnp, uflags); if (error) return (error); #endif /* MAC */ @@ -2727,7 +2729,8 @@ break; case 0: /* run this access check */ - result[i] = access1(vp, dvp, input[i].ad_flags, &context); + result[i] = access1(vp, dvp, NULL, input[i].ad_flags, + &context); break; default: /* fatal lookup error */ @@ -2779,7 +2782,7 @@ if (error) goto out; - error = access1(nd.ni_vp, nd.ni_dvp, uap->flags, &context); + error = access1(nd.ni_vp, nd.ni_dvp, &nd.ni_cnd, uap->flags, &context); vnode_put(nd.ni_vp); if (uap->flags & _DELETE_OK) ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#39 (text+ko) ==== @@ -204,7 +204,7 @@ struct vfs_attr *vfa); int mac_mount_check_label_update(struct ucred *cred, struct mount *mp); int mac_mount_check_mount(struct ucred *cred, struct vnode *vp, - const char *vfc_name); + struct componentname *cnp, const char *vfc_name); int mac_mount_check_remount(struct ucred *cred, struct mount *mp); int mac_mount_check_setattr(struct ucred *cred, struct mount *mp, struct vfs_attr *vfa); @@ -368,9 +368,10 @@ int mac_task_check_get_port(struct ucred *cred, struct task *task); void mac_thread_userret(int code, int error, struct thread *thread); int mac_vnode_check_access(struct ucred *cred, struct vnode *vp, - int acc_mode); + struct componentname *cnp, int acc_mode); int mac_vnode_check_chdir(struct ucred *cred, struct vnode *dvp); -int mac_vnode_check_chroot(struct ucred *cred, struct vnode *dvp); +int mac_vnode_check_chroot(struct ucred *cred, struct vnode *dvp, + struct componentname *cnp); int mac_vnode_check_create(struct ucred *cred, struct vnode *dvp, struct componentname *cnp, struct vnode_attr *vap); int mac_vnode_check_deleteextattr(struct ucred *cred, struct vnode *vp, ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#47 (text+ko) ==== @@ -1619,6 +1619,7 @@ @param cred Subject credential @param vp Vnode that is to be the mount point @param vlabel Label associated with the vnode + @param cnp Component name for vp @param vfc_name Filesystem type name Determine whether the subject identified by the credential can perform @@ -1631,6 +1632,7 @@ struct ucred *cred, struct vnode *vp, struct label *vlabel, + struct componentname *cnp, const char *vfc_name ); /** @@ -4391,6 +4393,7 @@ @param cred Subject credential @param vp Object vnode @param label Label for vp + @param cnp Component name for vp @param acc_mode access(2) flags Determine how invocations of access(2) and related calls by the @@ -4407,6 +4410,7 @@ struct ucred *cred, struct vnode *vp, struct label *label, + struct componentname *cnp, int acc_mode ); /** @@ -4432,6 +4436,7 @@ @param cred Subject credential @param dvp Directory vnode @param dlabel Policy label associated with dvp + @param cnp Component name for dvp Determine whether the subject identified by the credential should be allowed to chroot(2) into the specified directory (dvp). @@ -4442,7 +4447,8 @@ typedef int mpo_vnode_check_chroot_t( struct ucred *cred, struct vnode *dvp, - struct label *dlabel + struct label *dlabel, + struct componentname *cnp ); /** @brief Access control check for creating vnode ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#26 (text+ko) ==== @@ -379,13 +379,14 @@ } int -mac_vnode_check_access(struct ucred *cred, struct vnode *vp, int acc_mode) +mac_vnode_check_access(struct ucred *cred, struct vnode *vp, + struct componentname *cnp, int acc_mode) { int error, mask; /* Convert {R,W,X}_OK values to V{READ,WRITE,EXEC} for entry points */ mask = ACCESS_MODE_TO_VNODE_MASK(acc_mode); - MAC_CHECK(vnode_check_access, cred, vp, vp->v_label, mask); + MAC_CHECK(vnode_check_access, cred, vp, vp->v_label, cnp, mask); return (error); } @@ -399,11 +400,12 @@ } int -mac_vnode_check_chroot(struct ucred *cred, struct vnode *dvp) +mac_vnode_check_chroot(struct ucred *cred, struct vnode *dvp, + struct componentname *cnp) { int error; - MAC_CHECK(vnode_check_chroot, cred, dvp, dvp->v_label); + MAC_CHECK(vnode_check_chroot, cred, dvp, dvp->v_label, cnp); return (error); } @@ -810,11 +812,12 @@ } int -mac_mount_check_mount(struct ucred *cred, struct vnode *vp, const char *vfc_name) +mac_mount_check_mount(struct ucred *cred, struct vnode *vp, + struct componentname *cnp, const char *vfc_name) { int error; - MAC_CHECK(mount_check_mount, cred, vp, vp->v_label, vfc_name); + MAC_CHECK(mount_check_mount, cred, vp, vp->v_label, cnp, vfc_name); return (error); } ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#78 (text+ko) ==== @@ -1454,7 +1454,7 @@ static int sebsd_mount_check_mount(struct ucred *cred, struct vnode *vp, struct label *vl, - const char *vfc_name) + struct componentname *cnp, const char *vfc_name) { int rc; u_int32_t sid; @@ -1465,7 +1465,7 @@ vsec = SLOT(vl); task = SLOT(cred->cr_label); - rc = vnode_has_perm(cred, vp, NULL, FILE__MOUNTON); + rc = vnode_has_perm(cred, vp, cnp, FILE__MOUNTON); if (rc) goto done; @@ -1906,14 +1906,14 @@ static int sebsd_vnode_check_access(struct ucred *cred, struct vnode *vp, - struct label *filelabel, int mask) + struct label *filelabel, struct componentname *cnp, int mask) { /* existence check (F_OK) */ if (mask == 0) return (0); - return (vnode_has_perm(cred, vp, NULL, + return (vnode_has_perm(cred, vp, cnp, file_mask_to_av(vp->v_type, mask))); } @@ -1928,12 +1928,12 @@ static int sebsd_vnode_check_chroot(struct ucred *cred, struct vnode *dvp, - struct label *dlabel) + struct label *dlabel, struct componentname *cnp) { /* TBD: Incomplete, SELinux also check capability(CAP_SYS_CHROOT)) */ /* MAY_EXEC ~= DIR__SEARCH */ - return (vnode_has_perm(cred, dvp, NULL, DIR__SEARCH)); + return (vnode_has_perm(cred, dvp, cnp, DIR__SEARCH)); } static int From owner-p4-projects@FreeBSD.ORG Thu Jan 25 15:05:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F3F8916A402; Thu, 25 Jan 2007 15:05:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D29D416A400 for ; Thu, 25 Jan 2007 15:05:31 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C3C9913C459 for ; Thu, 25 Jan 2007 15:05:31 +0000 (UTC) (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 l0PF5VP5052710 for ; Thu, 25 Jan 2007 15:05:31 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0PF5VSm052707 for perforce@freebsd.org; Thu, 25 Jan 2007 15:05:31 GMT (envelope-from millert@freebsd.org) Date: Thu, 25 Jan 2007 15:05:31 GMT Message-Id: <200701251505.l0PF5VSm052707@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 113506 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2007 15:05:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=113506 Change 113506 by millert@millert_macbook on 2007/01/25 15:04:49 Add clearenv() Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsecompat/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsecompat/clearenv.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsecompat/secompat.h#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsecompat/Makefile#3 (text+ko) ==== @@ -1,7 +1,7 @@ include ../../../Makeconfig LIB = secompat -OBJS = getline.o strndup.o +OBJS = clearenv.o getline.o strndup.o CFLAGS += -Wall ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsecompat/secompat.h#2 (text+ko) ==== @@ -3,5 +3,6 @@ ssize_t getline(char **, size_t *, FILE *); char *strndup(const char *, size_t); +int clearenv(void); #endif /* _SECOMPAT_H_ */ From owner-p4-projects@FreeBSD.ORG Thu Jan 25 15:06:34 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 164D716A405; Thu, 25 Jan 2007 15:06:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DE9F316A403 for ; Thu, 25 Jan 2007 15:06:33 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CF2F713C442 for ; Thu, 25 Jan 2007 15:06:33 +0000 (UTC) (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 l0PF6Xnj052753 for ; Thu, 25 Jan 2007 15:06:33 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0PF6Xtx052749 for perforce@freebsd.org; Thu, 25 Jan 2007 15:06:33 GMT (envelope-from millert@freebsd.org) Date: Thu, 25 Jan 2007 15:06:33 GMT Message-Id: <200701251506.l0PF6Xtx052749@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 113507 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2007 15:06:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=113507 Change 113507 by millert@millert_macbook on 2007/01/25 15:06:05 Update to libsepol-1.16.0 from the NSA web site. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/ChangeLog#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/VERSION#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/link.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/write.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/ChangeLog#5 (text+ko) ==== @@ -1,3 +1,20 @@ +1.16.0 2007-01-18 + * Updated version for stable branch. + +1.15.3 2006-11-27 + * Merged patch to compile wit -fPIC instead of -fpic from + Manoj Srivastava to prevent hitting the global offest table + limit. Patch changed to include libselinux and libsemanage in + addition to libselinux. +1.15.2 2006-10-31 + * Merged fix from Karl MacMillan for a segfault when linking + non-MLS modules with users in them. + +1.15.1 2006-10-24 + * Merged fix for version comparison that was preventing range + transition rules from being written for a version 5 base policy + from Darrel Goeddel. + 1.14 2006-10-17 * Updated version for release. ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/VERSION#5 (text+ko) ==== @@ -1,1 +1,1 @@ -1.14 +1.16.0 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/link.c#5 (text+ko) ==== @@ -827,19 +827,24 @@ return -1; } -static int mls_level_convert(mls_semantic_level_t * src, - mls_semantic_level_t * dst, policy_module_t * mod) +static int mls_level_convert(mls_semantic_level_t * src, mls_semantic_level_t * dst, + policy_module_t * mod, link_state_t * state) { mls_semantic_cat_t *src_cat, *new_cat; + if (!mod->policy->mls) + return 0; + assert(mod->map[SYM_LEVELS][src->sens - 1]); dst->sens = mod->map[SYM_LEVELS][src->sens - 1]; for (src_cat = src->cat; src_cat; src_cat = src_cat->next) { new_cat = (mls_semantic_cat_t *) malloc(sizeof(mls_semantic_cat_t)); - if (!new_cat) + if (!new_cat) { + ERR(state->handle, "Out of memory"); return -1; + } mls_semantic_cat_init(new_cat); new_cat->next = dst->cat; @@ -854,13 +859,16 @@ return 0; } -static int mls_range_convert(mls_semantic_range_t * src, - mls_semantic_range_t * dst, policy_module_t * mod) +static int mls_range_convert(mls_semantic_range_t * src, mls_semantic_range_t * dst, + policy_module_t * mod, link_state_t * state) { - if (mls_level_convert(&src->level[0], &dst->level[0], mod)) - return -1; - if (mls_level_convert(&src->level[1], &dst->level[1], mod)) - return -1; + int ret; + ret = mls_level_convert(&src->level[0], &dst->level[0], mod, state); + if (ret) + return ret; + ret = mls_level_convert(&src->level[1], &dst->level[1], mod, state); + if (ret) + return ret; return 0; } @@ -994,10 +1002,10 @@ goto cleanup; } - if (mls_range_convert(&user->range, &new_user->range, mod)) + if (mls_range_convert(&user->range, &new_user->range, mod, state)) goto cleanup; - if (mls_level_convert(&user->dfltlevel, &new_user->dfltlevel, mod)) + if (mls_level_convert(&user->dfltlevel, &new_user->dfltlevel, mod, state)) goto cleanup; return 0; @@ -1224,7 +1232,7 @@ } } - if (mls_range_convert(&rule->trange, &new_rule->trange, mod)) + if (mls_range_convert(&rule->trange, &new_rule->trange, mod, state)) goto cleanup; } return 0; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/write.c#4 (text+ko) ==== @@ -1641,7 +1641,7 @@ if ((p->policyvers >= POLICYDB_VERSION_MLS && p->policy_type == POLICY_KERN) || (p->policyvers >= MOD_POLICYDB_VERSION_MLS - && p->policyvers < MOD_POLICYDB_VERSION_MLS + && p->policyvers < MOD_POLICYDB_VERSION_RANGETRANS && p->policy_type == POLICY_BASE)) { if (range_write(p, fp)) { return POLICYDB_ERROR; From owner-p4-projects@FreeBSD.ORG Thu Jan 25 15:11:41 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EFF716A40A; Thu, 25 Jan 2007 15:11:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0FBAF16A404 for ; Thu, 25 Jan 2007 15:11:41 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id F329013C44B for ; Thu, 25 Jan 2007 15:11:40 +0000 (UTC) (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 l0PFBekl053778 for ; Thu, 25 Jan 2007 15:11:40 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0PFBeNK053772 for perforce@freebsd.org; Thu, 25 Jan 2007 15:11:40 GMT (envelope-from millert@freebsd.org) Date: Thu, 25 Jan 2007 15:11:40 GMT Message-Id: <200701251511.l0PFBeNK053772@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 113508 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2007 15:11:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=113508 Change 113508 by millert@millert_macbook on 2007/01/25 15:11:29 Update to libselinux-1.34.0 from the NSA web site. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/ChangeLog#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/VERSION#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/av_permissions.h#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/flask.h#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/selinux.h#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/avc_add_callback.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/avc_cache_stats.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/avc_context_to_sid.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/avc_has_perm.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/avc_init.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/context_new.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/freecon.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/get_ordered_context_list.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/getcon.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/getexeccon.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/getfilecon.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/getfscreatecon.3#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/getseuserbyname.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/is_context_customizable.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/is_selinux_enabled.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/matchmediacon.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/matchpathcon.3#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/security_check_context.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/security_compute_av.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/security_getenforce.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/security_load_booleans.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/security_load_policy.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/security_policyvers.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/selinux_binary_policy_path.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/selinux_check_securetty_context.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/selinux_getenforcemode.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/selinux_policy_root.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/selinux_securetty_types_path.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/setfilecon.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man8/avcstat.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man8/getenforce.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man8/getsebool.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man8/matchpathcon.8#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man8/selinuxenabled.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man8/setenforce.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man8/togglesebool.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/Makefile#7 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/av_perm_to_string.h#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/class_to_string.h#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/file_path_suffixes.h#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/sedarwin_config.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinux_check_securetty_context.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinux_config.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinux_internal.h#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/getdefaultcon.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/matchpathcon.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/selinux_check_securetty_context.c#1 add Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/ChangeLog#5 (text+ko) ==== @@ -1,3 +1,30 @@ +1.34.0 2007-01-18 + * Updated version for stable branch. + +1.33.6 2007-01-17 + * Merged man page updates to make "apropos selinux" work from Dan Walsh. + +1.33.5 2007-01-16 + * Merged getdefaultcon utility from Dan Walsh. + +1.33.4 2007-01-11 + * Merged selinux_check_securetty_context() and support from Dan Walsh. + +1.33.3 2007-01-04 + * Merged patch for matchpathcon utility to use file mode information + when available from Dan Walsh. + +1.33.2 2006-11-27 + * Merged patch to compile with -fPIC instead of -fpic from + Manoj Srivastava to prevent hitting the global offset table + limit. Patch changed to include libsepol and libsemanage in + addition to libselinux. + +1.33.1 2006-10-19 + * Merged updated flask definitions from Darrel Goeddel. + This adds the context security class, and also adds + the string definitions for setsockcreate and polmatch. + 1.32 2006-10-17 * Updated version for release. ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/VERSION#5 (text+ko) ==== @@ -1,1 +1,1 @@ -1.32 +1.34.0 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/av_permissions.h#5 (text+ko) ==== @@ -438,7 +438,7 @@ #define PROCESS__EXECSTACK 0x04000000UL #define PROCESS__EXECHEAP 0x08000000UL #define PROCESS__SETKEYCREATE 0x10000000UL -#define PROCESS__TASKFORPID 0x20000000UL +#define PROCESS__SETSOCKCREATE 0x20000000UL #define IPC__CREATE 0x00000001UL #define IPC__DESTROY 0x00000002UL #define IPC__GETATTR 0x00000004UL @@ -895,18 +895,5 @@ #define KEY__LINK 0x00000010UL #define KEY__SETATTR 0x00000020UL #define KEY__CREATE 0x00000040UL -#define MACH_PORT__RELABELFROM 0x00000001UL -#define MACH_PORT__RELABELTO 0x00000002UL -#define MACH_PORT__SEND 0x00000004UL -#define MACH_PORT__RECV 0x00000008UL -#define MACH_PORT__MAKE_SEND 0x00000010UL -#define MACH_PORT__MAKE_SEND_ONCE 0x00000020UL -#define MACH_PORT__COPY_SEND 0x00000040UL -#define MACH_PORT__MOVE_SEND 0x00000080UL -#define MACH_PORT__MOVE_SEND_ONCE 0x00000100UL -#define MACH_PORT__MOVE_RECV 0x00000200UL -#define MACH_PORT__HOLD_SEND 0x00000400UL -#define MACH_PORT__HOLD_SEND_ONCE 0x00000800UL -#define MACH_PORT__HOLD_RECV 0x00001000UL -#define MACH_TASK__TERMINATE 0x00000001UL -#define MACH_TASK__SET_SPECIAL_PORT 0x00000002UL +#define CONTEXT__TRANSLATE 0x00000001UL +#define CONTEXT__CONTAINS 0x00000002UL ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/flask.h#4 (text+ko) ==== @@ -63,8 +63,7 @@ #define SECCLASS_APPLETALK_SOCKET 56 #define SECCLASS_PACKET 57 #define SECCLASS_KEY 58 -#define SECCLASS_MACH_PORT 59 -#define SECCLASS_MACH_TASK 60 +#define SECCLASS_CONTEXT 59 /* * Security identifier indices for initial entities @@ -96,8 +95,7 @@ #define SECINITSID_POLICY 25 #define SECINITSID_SCMP_PACKET 26 #define SECINITSID_DEVNULL 27 -#define SECINITSID_DEVFS 28 -#define SECINITSID_NUM 28 +#define SECINITSID_NUM 27 #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/selinux.h#4 (text+ko) ==== @@ -40,16 +40,14 @@ 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); + set *con to refer to it. Caller must free via freecon. */ + 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. - This has not been ported to SEBSD yet.*/ -// extern int getprevcon(security_context_t * con); -// extern int getprevcon_raw(security_context_t * con); + Caller must free via freecon. */ + 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. @@ -78,9 +76,10 @@ /* 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); + If non-NULL, caller must free via freecon. + This has not been ported to SEBSD yet. */ +// 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. */ @@ -150,16 +149,15 @@ struct av_decision *avd); /* Compute a labeling decision and set *newcon to refer to it. - Caller must free via freecon. - This has not been ported to SEBSD yet. */ -// extern int security_compute_create(security_context_t scon, -// security_context_t tcon, -// security_class_t tclass, -// security_context_t * newcon); -// extern int security_compute_create_raw(security_context_t scon, -// security_context_t tcon, -// security_class_t tclass, -// security_context_t * newcon); + Caller must free via freecon. */ + extern int security_compute_create(security_context_t scon, + security_context_t tcon, + security_class_t tclass, + security_context_t * newcon); + extern int security_compute_create_raw(security_context_t scon, + security_context_t tcon, + security_class_t tclass, + security_context_t * newcon); /* Compute a relabeling decision and set *newcon to refer to it. Caller must free via freecon. */ @@ -173,16 +171,15 @@ security_context_t * newcon); /* Compute a polyinstantiation member decision and set *newcon to refer to it. - Caller must free via freecon. - This has not been ported to SEBSD yet. */ -// extern int security_compute_member(security_context_t scon, -// security_context_t tcon, -// security_class_t tclass, -// security_context_t * newcon); -// extern int security_compute_member_raw(security_context_t scon, -// security_context_t tcon, -// security_class_t tclass, -// security_context_t * newcon); + Caller must free via freecon. */ + extern int security_compute_member(security_context_t scon, + security_context_t tcon, + security_class_t tclass, + security_context_t * newcon); + extern int security_compute_member_raw(security_context_t scon, + security_context_t tcon, + security_class_t tclass, + security_context_t * newcon); /* Compute the set of reachable user contexts and set *con to refer to the NULL-terminated array of contexts. Caller must free via freeconary. */ @@ -253,19 +250,16 @@ the active policy boolean configuration file. */ extern int security_load_booleans(char *path); -/* Check the validity of a security context. - * This has not been ported to SEBSD yet. */ -// extern int security_check_context(security_context_t con); -// extern int security_check_context_raw(security_context_t con); +/* Check the validity of a security context. */ + extern int security_check_context(security_context_t con); + extern int security_check_context_raw(security_context_t con); -/* Canonicalize a security context. - * These are not fully implemented in SEBSD yet. At the moment - * input = output. */ +/* Canonicalize a security context. */ extern int security_canonicalize_context(security_context_t con, security_context_t * canoncon); -// extern int security_canonicalize_context_raw(security_context_t con, -// security_context_t * -// canoncon); + extern int security_canonicalize_context_raw(security_context_t con, + security_context_t * + canoncon); /* Get the enforce flag value. */ extern int security_getenforce(void); @@ -316,7 +310,7 @@ validity of a context in the file contexts configuration. If not set, then this defaults to a test based on security_check_context(). The function is also responsible for reporting any such error, and - may include the 'path' and 'lineno' in such error messages. */ + may include the 'path' and 'lineno' in such error messages. */ extern void set_matchpathcon_invalidcon(int (*f) (const char *path, unsigned lineno, char *context)); @@ -324,7 +318,7 @@ /* Same as above, but also allows canonicalization of the context, by changing *context to refer to the canonical form. If not set, and invalidcon is also not set, then this defaults to calling - security_canonicalize_context(). */ + security_canonicalize_context(). */ extern void set_matchpathcon_canoncon(int (*f) (const char *path, unsigned lineno, char **context)); @@ -346,7 +340,7 @@ extern int matchpathcon_init(const char *path); /* Same as matchpathcon_init, but only load entries with - regexes that have stems that are prefixes of 'prefix'. */ + regexes that have stems that are prefixes of 'prefix'. */ extern int matchpathcon_init_prefix(const char *path, const char *prefix); @@ -425,6 +419,7 @@ extern const char *selinux_homedir_context_path(void); extern const char *selinux_media_context_path(void); extern const char *selinux_contexts_path(void); + extern const char *selinux_securetty_types_path(void); extern const char *selinux_booleans_path(void); extern const char *selinux_customizable_types_path(void); extern const char *selinux_users_path(void); @@ -439,6 +434,11 @@ // extern int selinux_check_passwd_access(access_vector_t requested); // extern int checkPasswdAccess(access_vector_t requested); +/* Check if the tty_context is defined as a securetty + Return 0 if secure, < 0 otherwise. */ + extern int selinux_check_securetty_context(security_context_t + tty_context); + /* Set the path to the selinuxfs mount point explicitly. Normally, this is determined automatically during libselinux initialization, but this is not always possible, e.g. for /sbin/init ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/avc_add_callback.3#2 (text+ko) ==== @@ -3,7 +3,7 @@ .\" Author: Eamon Walsh (ewalsh@epoch.ncsc.mil) 2004 .TH "avc_add_callback" "3" "9 June 2004" "" "SE Linux API documentation" .SH "NAME" -avc_add_callback \- additional event notification for userspace object managers. +avc_add_callback \- additional event notification for SELinux userspace object managers. .SH "SYNOPSIS" .B #include .br @@ -181,3 +181,4 @@ .BR avc_context_to_sid (3), .BR avc_cache_stats (3), .BR security_compute_av (3) +.BR selinux (8) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/avc_cache_stats.3#2 (text+ko) ==== @@ -3,7 +3,7 @@ .\" Author: Eamon Walsh (ewalsh@epoch.ncsc.mil) 2004 .TH "avc_cache_stats" "3" "27 May 2004" "" "SE Linux API documentation" .SH "NAME" -avc_cache_stats, avc_av_stats, avc_sid_stats \- obtain userspace AVC statistics. +avc_cache_stats, avc_av_stats, avc_sid_stats \- obtain userspace SELinux AVC statistics. .SH "SYNOPSIS" .B #include .br @@ -96,3 +96,4 @@ .BR avc_has_perm (3), .BR avc_context_to_sid (3), .BR avc_add_callback (3) +.BR selinux (8) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/avc_context_to_sid.3#2 (text+ko) ==== @@ -3,7 +3,7 @@ .\" Author: Eamon Walsh (ewalsh@epoch.ncsc.mil) 2004 .TH "avc_context_to_sid" "3" "27 May 2004" "" "SE Linux API documentation" .SH "NAME" -avc_context_to_sid, avc_sid_to_context, sidput, sidget \- obtain and manipulate security ID's. +avc_context_to_sid, avc_sid_to_context, sidput, sidget \- obtain and manipulate SELinux security ID's. .SH "SYNOPSIS" .B #include .br @@ -88,3 +88,4 @@ .BR avc_add_callback (3), .BR getcon (3), .BR freecon (3) +.BR selinux (8) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/avc_has_perm.3#2 (text+ko) ==== @@ -152,3 +152,4 @@ .BR avc_cache_stats (3), .BR avc_add_callback (3), .BR security_compute_av (3) +.BR selinux(8) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/avc_init.3#2 (text+ko) ==== @@ -3,7 +3,7 @@ .\" Author: Eamon Walsh (ewalsh@epoch.ncsc.mil) 2004 .TH "avc_init" "3" "27 May 2004" "" "SE Linux API documentation" .SH "NAME" -avc_init, avc_destroy, avc_reset, avc_cleanup \- userspace AVC setup and teardown. +avc_init, avc_destroy, avc_reset, avc_cleanup \- userspace SELinux AVC setup and teardown. .SH "SYNOPSIS" .B #include .br @@ -209,3 +209,5 @@ .BR avc_cache_stats (3), .BR avc_add_callback (3), .BR security_compute_av (3) +.BR selinux (8) + ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/context_new.3#2 (text+ko) ==== @@ -56,3 +56,6 @@ On success, zero is returned. On failure, -1 is returned and errno is set appropriately. +.SH "SEE ALSO" +.BR selinux "(8)" + ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/freecon.3#2 (text+ko) ==== @@ -1,6 +1,6 @@ .TH "freecon" "3" "1 January 2004" "russell@coker.com.au" "SE Linux API documentation" .SH "NAME" -freecon, freeconary \- free memory associated with SE Linux security contexts. +freecon, freeconary \- free memory associated with SELinux security contexts. .SH "SYNOPSIS" .B #include .sp @@ -14,3 +14,7 @@ .B freeconary frees the memory allocated for a context array. + +.SH "SEE ALSO" +.BR selinux "(8)" + ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/get_ordered_context_list.3#2 (text+ko) ==== @@ -1,6 +1,6 @@ .TH "get_ordered_context_list" "3" "1 January 2004" "russell@coker.com.au" "SE Linux" .SH "NAME" -get_ordered_context_list, get_ordered_context_list_with_level, get_default_context, get_default_context_with_level, get_default_context_with_role, get_default_context_with_rolelevel, query_user_context, manual_user_enter_context, get_default_role \- determine context(s) for user sessions +get_ordered_context_list, get_ordered_context_list_with_level, get_default_context, get_default_context_with_level, get_default_context_with_role, get_default_context_with_rolelevel, query_user_context, manual_user_enter_context, get_default_role \- determine SELinux context(s) for user sessions .SH "SYNOPSIS" .B #include @@ -77,4 +77,4 @@ The other functions return 0 for success or -1 for errors. .SH "SEE ALSO" -.BR freeconary "(3), " freecon "(3), " security_compute_av "(3)", getseuserbyname"(3)" +.BR selinux "(8), " freeconary "(3), " freecon "(3), " security_compute_av "(3)", getseuserbyname"(3)" ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/getcon.3#2 (text+ko) ==== @@ -1,6 +1,6 @@ .TH "getcon" "3" "1 January 2004" "russell@coker.com.au" "SE Linux API documentation" .SH "NAME" -getcon, getprevcon, getpidcon \- get SE Linux security context of a process. +getcon, getprevcon, getpidcon \- get SELinux security context of a process. .br getpeercon - get security context of a peer socket. .br @@ -59,4 +59,4 @@ On error -1 is returned. On success 0 is returned. .SH "SEE ALSO" -.BR freecon "(3), " setexeccon "(3)" +.BR selinux "(8), " freecon "(3), " setexeccon "(3)" ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/getexeccon.3#2 (text+ko) ==== @@ -1,6 +1,6 @@ .TH "getexeccon" "3" "1 January 2004" "russell@coker.com.au" "SE Linux API documentation" .SH "NAME" -getexeccon, setexeccon \- get or set the SE Linux security context used for executing a new process. +getexeccon, setexeccon \- get or set the SELinux security context used for executing a new process. .br rpm_execcon \- run a helper for rpm in an appropriate security context @@ -55,6 +55,6 @@ rpm_execcon only returns upon errors, as it calls execve(2). .SH "SEE ALSO" -.BR freecon "(3), " getcon "(3)" +.BR selinux "(8), " freecon "(3), " getcon "(3)" ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/getfilecon.3#2 (text+ko) ==== @@ -1,6 +1,6 @@ .TH "getfilecon" "3" "1 January 2004" "russell@coker.com.au" "SE Linux API documentation" .SH "NAME" -getfilecon, fgetfilecon, lgetfilecon \- get SE Linux security context of a file +getfilecon, fgetfilecon, lgetfilecon \- get SELinux security context of a file .SH "SYNOPSIS" .B #include .sp @@ -40,4 +40,4 @@ here. .SH "SEE ALSO" -.BR freecon "(3), " setfilecon "(3), " setfscreatecon "(3)" +.BR selinux "(8), " freecon "(3), " setfilecon "(3), " setfscreatecon "(3)" ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/getfscreatecon.3#3 (text+ko) ==== @@ -1,6 +1,6 @@ .TH "getfscreatecon" "3" "1 January 2004" "russell@coker.com.au" "SE Linux API documentation" .SH "NAME" -getfscreatecon, setfscreatecon \- get or set the SE Linux security context used for creating a new file system object. +getfscreatecon, setfscreatecon \- get or set the SELinux security context used for creating a new file system object. .SH "SYNOPSIS" .B #include @@ -35,4 +35,4 @@ On success 0 is returned. .SH "SEE ALSO" -.BR freecon "(3), " getcon "(3), " getexeccon "(3)" +.BR selinux "(8), " freecon "(3), " getcon "(3), " getexeccon "(3)" ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/getseuserbyname.3#2 (text+ko) ==== @@ -23,3 +23,6 @@ The errors documented for the stat(2) system call are also applicable here. +.SH "SEE ALSO" +.BR selinux "(8)" + ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/is_context_customizable.3#2 (text+ko) ==== @@ -1,6 +1,6 @@ .TH "is_context_customizable" "3" "10 January 2005" "dwalsh@redhat.com" "SELinux API documentation" .SH "NAME" -is_context_customizable \- check whether context type is customizable by the administrator. +is_context_customizable \- check whether SELinux context type is customizable by the administrator. .SH "SYNOPSIS" .B #include .sp @@ -20,3 +20,6 @@ .SH "FILE" /etc/selinux/SELINUXTYPE/context/customizable_types +.SH "SEE ALSO" +.BR selinux "(8)" + ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/is_selinux_enabled.3#2 (text+ko) ==== @@ -1,6 +1,6 @@ .TH "is_selinux_enabled" "3" "1 January 2004" "russell@coker.com.au" "SE Linux API documentation" .SH "NAME" -is_selinux_enabled \- check whether SE Linux is enabled +is_selinux_enabled \- check whether SELinux is enabled .SH "SYNOPSIS" .B #include .sp @@ -9,3 +9,7 @@ .SH "DESCRIPTION" .B is_selinux_enabled returns 1 if SE Linux is running or 0 if it is not. May change soon. + +.SH "SEE ALSO" +.BR selinux "(8)" + ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/matchmediacon.3#2 (text+ko) ==== @@ -1,6 +1,6 @@ .TH "matchmediacon" "3" "15 November 2004" "dwalsh@redhat.com" "SE Linux API documentation" .SH "NAME" -matchmediacon \- get the default security context for the specified mediatype from the policy. +matchmediacon \- get the default SELinux security context for the specified mediatype from the policy. .SH "SYNOPSIS" .B #include @@ -23,4 +23,4 @@ /etc/selinux/POLICYTYPE/contexts/files/media .SH "SEE ALSO" -.BR freecon "(3) +.BR selinux "(8), " freecon "(3) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/matchpathcon.3#3 (text+ko) ==== @@ -1,6 +1,6 @@ .TH "matchpathcon" "3" "16 March 2005" "sds@tycho.nsa.gov" "SE Linux API documentation" .SH "NAME" -matchpathcon \- get the default security context for the specified path from the file contexts configuration. +matchpathcon \- get the default SELinux security context for the specified path from the file contexts configuration. .SH "SYNOPSIS" .B #include @@ -117,4 +117,4 @@ Returns 0 on success or -1 otherwise. .SH "SEE ALSO" -.BR freecon "(3), " setfilecon "(3), " setfscreatecon "(3)" +.BR selinux "(8), " freecon "(3), " setfilecon "(3), " setfscreatecon "(3)" ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/security_check_context.3#2 (text+ko) ==== @@ -1,6 +1,6 @@ .TH "security_check_context" "3" "1 January 2004" "russell@coker.com.au" "SE Linux API documentation" .SH "NAME" -security_check_context \- check the validity of a context +security_check_context \- check the validity of a SELinux context .SH "SYNOPSIS" .B #include .sp @@ -10,3 +10,7 @@ .B security_check_context returns 0 if SE Linux is running and the context is valid, otherwise it returns -1. + +.SH "SEE ALSO" +.BR selinux "(8)" + ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/security_compute_av.3#2 (text+ko) ==== @@ -1,7 +1,7 @@ .TH "security_compute_av" "3" "1 January 2004" "russell@coker.com.au" "SE Linux API documentation" .SH "NAME" security_compute_av, security_compute_create, security_compute_relabel, security_compute_user \- query -the SE Linux policy database in the kernel. +the SELinux policy database in the kernel. .SH "SYNOPSIS" .B #include @@ -51,4 +51,4 @@ 0 for success and on error -1 is returned. .SH "SEE ALSO" -.BR getcon "(3), " getfilecon "(3), " get_ordered_context_list "(3)" +.BR selinux "(8), " getcon "(3), " getfilecon "(3), " get_ordered_context_list "(3)" ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/security_getenforce.3#2 (text+ko) ==== @@ -1,6 +1,6 @@ .TH "security_getenforce" "3" "1 January 2004" "russell@coker.com.au" "SE Linux API documentation" .SH "NAME" -security_getenforce, security_setenforce \- get or set the enforcing state of SE Linux +security_getenforce, security_setenforce \- get or set the enforcing state of SELinux .SH "SYNOPSIS" .B #include .sp @@ -17,3 +17,7 @@ sets SE Linux to enforcing mode if the value 1 is passed in, and sets it to permissive mode if 0 is passed in. On success 0 is returned, on error -1 is returned. + +.SH "SEE ALSO" +.BR selinux "(8)" + ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/security_load_booleans.3#2 (text+ko) ==== @@ -56,4 +56,4 @@ This manual page was written by Dan Walsh . .SH "SEE ALSO" -getsebool(8), booleans(8), togglesebool(8) +selinux(8), getsebool(8), booleans(8), togglesebool(8) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/security_load_policy.3#2 (text+ko) ==== @@ -1,6 +1,6 @@ .TH "security_load_policy" "3" "1 January 2004" "russell@coker.com.au" "SE Linux API documentation" .SH "NAME" -security_load_policy \- load a new policy +security_load_policy \- load a new SELinux policy .SH "SYNOPSIS" .B #include .sp @@ -9,3 +9,7 @@ .SH "DESCRIPTION" .B security_load_policy loads a new policy, returns 0 for success and -1 for error. + +.SH "SEE ALSO" +.BR selinux "(8)" + ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/security_policyvers.3#2 (text+ko) ==== @@ -1,6 +1,6 @@ .TH "security_policyvers" "3" "1 January 2004" "russell@coker.com.au" "SE Linux API documentation" .SH "NAME" -security_policyvers \- get the version of the SE Linux policy +security_policyvers \- get the version of the SELinux policy .SH "SYNOPSIS" .B #include .sp @@ -10,3 +10,7 @@ .B security_policyvers returns the version of the policy (a positive integer) on success, or -1 on error. + +.SH "SEE ALSO" +.BR selinux "(8)" + ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/selinux_binary_policy_path.3#2 (text+ko) ==== @@ -4,7 +4,7 @@ selinux_failsafe_context_path, selinux_removable_context_path, selinux_default_context_path, selinux_user_contexts_path, selinux_file_context_path, selinux_media_context_path, -selinux_contexts_path, selinux_booleans_path \- These functions return the paths to the active policy configuration +selinux_contexts_path, selinux_booleans_path \- These functions return the paths to the active SELinux policy configuration directories and files. .SH "SYNOPSIS" @@ -27,6 +27,8 @@ .br extern const char *selinux_media_context_path(void); .br +extern const char *selinux_securetty_types_path(void); +.br extern const char *selinux_contexts_path(void); .br extern const char *selinux_booleans_path(void); @@ -56,8 +58,13 @@ .sp selinux_contexts_path() - directory containing all of the context configuration files .sp +selinux_securetty_types_path() - defines tty types for newrole securettys +.sp selinux_booleans_path() - initial policy boolean settings .SH AUTHOR This manual page was written by Dan Walsh . +.SH "SEE ALSO" +.BR selinux "(8)" + ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/selinux_getenforcemode.3#2 (text+ko) ==== @@ -1,6 +1,6 @@ .TH "selinux_getenforcemode" "3" "25 May 2004" "dwalsh@redhat.com" "SE Linux API documentation" .SH "NAME" -selinux_getenforcemode \- get the enforcing state of SE Linux +selinux_getenforcemode \- get the enforcing state of SELinux .SH "SYNOPSIS" .B #include .sp @@ -19,4 +19,7 @@ On success, zero is returned. On failure, -1 is returned. +.SH "SEE ALSO" +.BR selinux "(8)" + ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/selinux_policy_root.3#2 (text+ko) ==== @@ -14,4 +14,7 @@ On success, returns a directory path containing the SELinux policy files. On failure, NULL is returned. +.SH "SEE ALSO" +.BR selinux "(8)" + ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/setfilecon.3#2 (text+ko) ==== @@ -1,6 +1,6 @@ .TH "setfilecon" "3" "1 January 2004" "russell@coker.com.au" "SE Linux API documentation" .SH "NAME" -setfilecon, fsetfilecon, lsetfilecon \- set SE Linux security context of a file +setfilecon, fsetfilecon, lsetfilecon \- set SELinux security context of a file .SH "SYNOPSIS" .B #include @@ -38,4 +38,4 @@ here. .SH "SEE ALSO" -.BR freecon "(3), " getfilecon "(3), " setfscreatecon "(3)" +.BR selinux "(3), " freecon "(3), " getfilecon "(3), " setfscreatecon "(3)" ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man8/avcstat.8#2 (text+ko) ==== @@ -22,6 +22,9 @@ .B \-f Specifies the location of the AVC statistics file, defaulting to '/selinux/avc/cache_stats'. +.SH "SEE ALSO" +selinux(8) + .SH AUTHOR This manual page was written by Dan Walsh . The program was written by James Morris . ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man8/getenforce.8#2 (text+ko) ==== @@ -12,4 +12,4 @@ Dan Walsh, .SH "SEE ALSO" -setenforce(8), selinuxenabled(8) +selinux(8), setenforce(8), selinuxenabled(8) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man8/getsebool.8#2 (text+ko) ==== @@ -26,9 +26,10 @@ .B \-a Show all SELinux booleans. +.SH "SEE ALSO" +selinux(8), setsebool(8), booleans(8) + .SH AUTHOR This manual page was written by Dan Walsh . The program was written by Tresys Technology. -.SH "SEE ALSO" -setsebool(8), booleans(8) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man8/matchpathcon.8#3 (text+ko) ==== @@ -1,6 +1,6 @@ .TH "matchpathcon" "8" "21 April 2005" "dwalsh@redhat.com" "SE Linux Command Line documentation" .SH "NAME" -matchpathcon \- get the default security context for the specified path from the file contexts configuration. +matchpathcon \- get the default SELinux security context for the specified path from the file contexts configuration. .SH "SYNOPSIS" .B matchpathcon [-V] [-N] [-n] [-f file_contexts_file ] [-p prefix ] filepath... @@ -27,4 +27,5 @@ This manual page was written by Dan Walsh . .SH "SEE ALSO" +.BR selinux "(8), " .BR mathpathcon "(3), " ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man8/selinuxenabled.8#2 (text+ko) ==== @@ -13,4 +13,4 @@ Dan Walsh, .SH "SEE ALSO" -setenforce(8), getenforce(8) +selinux(8), setenforce(8), getenforce(8) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man8/setenforce.8#2 (text+ko) ==== @@ -17,7 +17,7 @@ Dan Walsh, .SH "SEE ALSO" -getenforce(8), selinuxenabled(8) +selinux(8), getenforce(8), selinuxenabled(8) .SH FILES /etc/grub.conf, /etc/selinux/config ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man8/togglesebool.8#2 (text+ko) ==== @@ -1,6 +1,6 @@ .TH "togglesebool" "1" "26 Oct 2004" "sgrubb@redhat.com" "SELinux Command Line documentation" .SH "NAME" -togglesebool \- flip the current value of a boolean +togglesebool \- flip the current value of a SELinux boolean .SH "SYNOPSIS" .B togglesebool boolean... @@ -14,4 +14,4 @@ This man page was written by Steve Grubb .SH "SEE ALSO" -booleans(8), getsebool(8), setsebool(8) +selinux(8), booleans(8), getsebool(8), setsebool(8) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/Makefile#7 (text+ko) ==== @@ -13,7 +13,8 @@ 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 \ + query_user_context.o sedarwin_config.o \ + selinux_check_securetty_context.o setcon.o setenforce.o \ setfilecon.o setrans_client.o seusers.o # The following require kernel support for fs and exec contexts ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/av_perm_to_string.h#4 (text+ko) ==== @@ -1,269 +1,269 @@ /* This file is automatically generated. Do not edit. */ - S_(SECCLASS_FILESYSTEM, FILESYSTEM__MOUNT, "mount") - S_(SECCLASS_FILESYSTEM, FILESYSTEM__REMOUNT, "remount") - S_(SECCLASS_FILESYSTEM, FILESYSTEM__UNMOUNT, "unmount") - S_(SECCLASS_FILESYSTEM, FILESYSTEM__GETATTR, "getattr") - S_(SECCLASS_FILESYSTEM, FILESYSTEM__RELABELFROM, "relabelfrom") - S_(SECCLASS_FILESYSTEM, FILESYSTEM__RELABELTO, "relabelto") - S_(SECCLASS_FILESYSTEM, FILESYSTEM__TRANSITION, "transition") - S_(SECCLASS_FILESYSTEM, FILESYSTEM__ASSOCIATE, "associate") - S_(SECCLASS_FILESYSTEM, FILESYSTEM__QUOTAMOD, "quotamod") - S_(SECCLASS_FILESYSTEM, FILESYSTEM__QUOTAGET, "quotaget") - S_(SECCLASS_DIR, DIR__ADD_NAME, "add_name") - S_(SECCLASS_DIR, DIR__REMOVE_NAME, "remove_name") - S_(SECCLASS_DIR, DIR__REPARENT, "reparent") - S_(SECCLASS_DIR, DIR__SEARCH, "search") - S_(SECCLASS_DIR, DIR__RMDIR, "rmdir") - S_(SECCLASS_FILE, FILE__EXECUTE_NO_TRANS, "execute_no_trans") - S_(SECCLASS_FILE, FILE__ENTRYPOINT, "entrypoint") - S_(SECCLASS_FILE, FILE__EXECMOD, "execmod") - S_(SECCLASS_CHR_FILE, CHR_FILE__EXECUTE_NO_TRANS, "execute_no_trans") - S_(SECCLASS_CHR_FILE, CHR_FILE__ENTRYPOINT, "entrypoint") - S_(SECCLASS_CHR_FILE, CHR_FILE__EXECMOD, "execmod") - S_(SECCLASS_FD, FD__USE, "use") - S_(SECCLASS_TCP_SOCKET, TCP_SOCKET__CONNECTTO, "connectto") - S_(SECCLASS_TCP_SOCKET, TCP_SOCKET__NEWCONN, "newconn") - S_(SECCLASS_TCP_SOCKET, TCP_SOCKET__ACCEPTFROM, "acceptfrom") - S_(SECCLASS_TCP_SOCKET, TCP_SOCKET__NODE_BIND, "node_bind") - S_(SECCLASS_TCP_SOCKET, TCP_SOCKET__NAME_CONNECT, "name_connect") - S_(SECCLASS_UDP_SOCKET, UDP_SOCKET__NODE_BIND, "node_bind") - S_(SECCLASS_RAWIP_SOCKET, RAWIP_SOCKET__NODE_BIND, "node_bind") - S_(SECCLASS_NODE, NODE__TCP_RECV, "tcp_recv") - S_(SECCLASS_NODE, NODE__TCP_SEND, "tcp_send") - S_(SECCLASS_NODE, NODE__UDP_RECV, "udp_recv") - S_(SECCLASS_NODE, NODE__UDP_SEND, "udp_send") - S_(SECCLASS_NODE, NODE__RAWIP_RECV, "rawip_recv") - S_(SECCLASS_NODE, NODE__RAWIP_SEND, "rawip_send") - S_(SECCLASS_NODE, NODE__ENFORCE_DEST, "enforce_dest") - S_(SECCLASS_NETIF, NETIF__TCP_RECV, "tcp_recv") - S_(SECCLASS_NETIF, NETIF__TCP_SEND, "tcp_send") - S_(SECCLASS_NETIF, NETIF__UDP_RECV, "udp_recv") - S_(SECCLASS_NETIF, NETIF__UDP_SEND, "udp_send") - S_(SECCLASS_NETIF, NETIF__RAWIP_RECV, "rawip_recv") - S_(SECCLASS_NETIF, NETIF__RAWIP_SEND, "rawip_send") - S_(SECCLASS_UNIX_STREAM_SOCKET, UNIX_STREAM_SOCKET__CONNECTTO, "connectto") - S_(SECCLASS_UNIX_STREAM_SOCKET, UNIX_STREAM_SOCKET__NEWCONN, "newconn") - S_(SECCLASS_UNIX_STREAM_SOCKET, UNIX_STREAM_SOCKET__ACCEPTFROM, "acceptfrom") - S_(SECCLASS_PROCESS, PROCESS__FORK, "fork") - S_(SECCLASS_PROCESS, PROCESS__TRANSITION, "transition") - S_(SECCLASS_PROCESS, PROCESS__SIGCHLD, "sigchld") - S_(SECCLASS_PROCESS, PROCESS__SIGKILL, "sigkill") - S_(SECCLASS_PROCESS, PROCESS__SIGSTOP, "sigstop") - S_(SECCLASS_PROCESS, PROCESS__SIGNULL, "signull") - S_(SECCLASS_PROCESS, PROCESS__SIGNAL, "signal") - S_(SECCLASS_PROCESS, PROCESS__PTRACE, "ptrace") - S_(SECCLASS_PROCESS, PROCESS__GETSCHED, "getsched") - S_(SECCLASS_PROCESS, PROCESS__SETSCHED, "setsched") - S_(SECCLASS_PROCESS, PROCESS__GETSESSION, "getsession") - S_(SECCLASS_PROCESS, PROCESS__GETPGID, "getpgid") - S_(SECCLASS_PROCESS, PROCESS__SETPGID, "setpgid") - S_(SECCLASS_PROCESS, PROCESS__GETCAP, "getcap") - S_(SECCLASS_PROCESS, PROCESS__SETCAP, "setcap") - S_(SECCLASS_PROCESS, PROCESS__SHARE, "share") - S_(SECCLASS_PROCESS, PROCESS__GETATTR, "getattr") - S_(SECCLASS_PROCESS, PROCESS__SETEXEC, "setexec") - S_(SECCLASS_PROCESS, PROCESS__SETFSCREATE, "setfscreate") - S_(SECCLASS_PROCESS, PROCESS__NOATSECURE, "noatsecure") - S_(SECCLASS_PROCESS, PROCESS__SIGINH, "siginh") - S_(SECCLASS_PROCESS, PROCESS__SETRLIMIT, "setrlimit") - S_(SECCLASS_PROCESS, PROCESS__RLIMITINH, "rlimitinh") - S_(SECCLASS_PROCESS, PROCESS__DYNTRANSITION, "dyntransition") - S_(SECCLASS_PROCESS, PROCESS__SETCURRENT, "setcurrent") - S_(SECCLASS_PROCESS, PROCESS__EXECMEM, "execmem") - S_(SECCLASS_PROCESS, PROCESS__EXECSTACK, "execstack") - S_(SECCLASS_PROCESS, PROCESS__EXECHEAP, "execheap") - S_(SECCLASS_PROCESS, PROCESS__SETKEYCREATE, "setkeycreate") - S_(SECCLASS_PROCESS, PROCESS__TASKFORPID, "taskforpid") - S_(SECCLASS_MSGQ, MSGQ__ENQUEUE, "enqueue") - S_(SECCLASS_MSG, MSG__SEND, "send") - S_(SECCLASS_MSG, MSG__RECEIVE, "receive") - S_(SECCLASS_SHM, SHM__LOCK, "lock") - S_(SECCLASS_SECURITY, SECURITY__COMPUTE_AV, "compute_av") - S_(SECCLASS_SECURITY, SECURITY__COMPUTE_CREATE, "compute_create") - S_(SECCLASS_SECURITY, SECURITY__COMPUTE_MEMBER, "compute_member") - S_(SECCLASS_SECURITY, SECURITY__CHECK_CONTEXT, "check_context") - S_(SECCLASS_SECURITY, SECURITY__LOAD_POLICY, "load_policy") - S_(SECCLASS_SECURITY, SECURITY__COMPUTE_RELABEL, "compute_relabel") - S_(SECCLASS_SECURITY, SECURITY__COMPUTE_USER, "compute_user") - S_(SECCLASS_SECURITY, SECURITY__SETENFORCE, "setenforce") - S_(SECCLASS_SECURITY, SECURITY__SETBOOL, "setbool") - S_(SECCLASS_SECURITY, SECURITY__SETSECPARAM, "setsecparam") - S_(SECCLASS_SECURITY, SECURITY__SETCHECKREQPROT, "setcheckreqprot") - S_(SECCLASS_SYSTEM, SYSTEM__IPC_INFO, "ipc_info") - S_(SECCLASS_SYSTEM, SYSTEM__SYSLOG_READ, "syslog_read") - S_(SECCLASS_SYSTEM, SYSTEM__SYSLOG_MOD, "syslog_mod") - S_(SECCLASS_SYSTEM, SYSTEM__SYSLOG_CONSOLE, "syslog_console") - S_(SECCLASS_CAPABILITY, CAPABILITY__CHOWN, "chown") - S_(SECCLASS_CAPABILITY, CAPABILITY__DAC_OVERRIDE, "dac_override") - S_(SECCLASS_CAPABILITY, CAPABILITY__DAC_READ_SEARCH, "dac_read_search") - S_(SECCLASS_CAPABILITY, CAPABILITY__FOWNER, "fowner") - S_(SECCLASS_CAPABILITY, CAPABILITY__FSETID, "fsetid") - S_(SECCLASS_CAPABILITY, CAPABILITY__KILL, "kill") - S_(SECCLASS_CAPABILITY, CAPABILITY__SETGID, "setgid") - S_(SECCLASS_CAPABILITY, CAPABILITY__SETUID, "setuid") - S_(SECCLASS_CAPABILITY, CAPABILITY__SETPCAP, "setpcap") - S_(SECCLASS_CAPABILITY, CAPABILITY__LINUX_IMMUTABLE, "linux_immutable") - S_(SECCLASS_CAPABILITY, CAPABILITY__NET_BIND_SERVICE, "net_bind_service") - S_(SECCLASS_CAPABILITY, CAPABILITY__NET_BROADCAST, "net_broadcast") - S_(SECCLASS_CAPABILITY, CAPABILITY__NET_ADMIN, "net_admin") - S_(SECCLASS_CAPABILITY, CAPABILITY__NET_RAW, "net_raw") >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 25 15:12:43 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2314316A405; Thu, 25 Jan 2007 15:12:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 019DA16A400 for ; Thu, 25 Jan 2007 15:12:43 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E5E5C13C455 for ; Thu, 25 Jan 2007 15:12:42 +0000 (UTC) (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 l0PFCgeS054103 for ; Thu, 25 Jan 2007 15:12:42 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0PFCgYG054097 for perforce@freebsd.org; Thu, 25 Jan 2007 15:12:42 GMT (envelope-from millert@freebsd.org) Date: Thu, 25 Jan 2007 15:12:42 GMT Message-Id: <200701251512.l0PFCgYG054097@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 113509 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2007 15:12:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=113509 Change 113509 by millert@millert_macbook on 2007/01/25 15:12:01 Update to checkpolicy-1.34.0 from the NSA web site. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/ChangeLog#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/VERSION#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/policy_parse.y#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/policy_scan.l#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/ChangeLog#5 (text+ko) ==== @@ -1,3 +1,9 @@ +1.34.0 2007-01-18 + * Updated version for stable branch. + +1.33.1 2006-11-13 + * Collapse user identifiers and identifiers together. + 1.32 2006-10-17 * Updated version for release. ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/VERSION#5 (text+ko) ==== @@ -1,1 +1,1 @@ -1.32 +1.34.0 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/policy_parse.y#5 (text+ko) ==== @@ -190,7 +190,6 @@ %token NOT AND OR XOR %token CTRUE CFALSE %token IDENTIFIER -%token USER_IDENTIFIER %token NUMBER %token EQUALS %token NOTEQUAL @@ -522,13 +521,13 @@ | T1 op T2 { $$ = define_cexpr(CEXPR_ATTR, CEXPR_TYPE, $2); if ($$ == 0) return -1; } - | U1 op { if (insert_separator(1)) return -1; } user_names_push + | U1 op { if (insert_separator(1)) return -1; } names_push { $$ = define_cexpr(CEXPR_NAMES, CEXPR_USER, $2); if ($$ == 0) return -1; } - | U2 op { if (insert_separator(1)) return -1; } user_names_push + | U2 op { if (insert_separator(1)) return -1; } names_push { $$ = define_cexpr(CEXPR_NAMES, (CEXPR_USER | CEXPR_TARGET), $2); if ($$ == 0) return -1; } - | U3 op { if (insert_separator(1)) return -1; } user_names_push + | U3 op { if (insert_separator(1)) return -1; } names_push { $$ = define_cexpr(CEXPR_NAMES, (CEXPR_USER | CEXPR_XTARGET), $2); if ($$ == 0) return -1; } | R1 op { if (insert_separator(1)) return -1; } names_push @@ -603,10 +602,7 @@ users : user_def | users user_def ; -user_id : identifier - | user_identifier - ; -user_def : USER user_id ROLES names opt_mls_user ';' +user_def : USER identifier ROLES names opt_mls_user ';' {if (define_user()) return -1;} ; opt_mls_user : LEVEL mls_level_def RANGE mls_range_def @@ -698,7 +694,7 @@ $$ = addr; } ; -security_context_def : user_id ':' identifier ':' identifier opt_mls_range_def +security_context_def : identifier ':' identifier ':' identifier opt_mls_range_def ; opt_mls_range_def : ':' mls_range_def | @@ -766,23 +762,6 @@ identifier : IDENTIFIER { if (insert_id(yytext,0)) return -1; } ; -user_identifier : USER_IDENTIFIER - { if (insert_id(yytext,0)) return -1; } - ; -user_identifier_push : USER_IDENTIFIER - { if (insert_id(yytext, 1)) return -1; } - ; -user_identifier_list_push : user_identifier_push - | identifier_list_push user_identifier_push - | user_identifier_list_push identifier_push - | user_identifier_list_push user_identifier_push - ; -user_names_push : names_push - | user_identifier_push - | '{' user_identifier_list_push '}' - | tilde_push user_identifier_push - | tilde_push '{' user_identifier_list_push '}' - ; path : PATH { if (insert_id(yytext,0)) return -1; } ; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/policy_scan.l#3 (text+ko) ==== @@ -200,12 +200,11 @@ h2 | H2 { return(H2); } "/"({letter}|{digit}|_|"."|"-"|"/")* { return(PATH); } -{letter}({letter}|{digit}|_|".")* { if (is_valid_identifier(yytext)) +{letter}({letter}|{digit}|_|"."|"-")* { if (is_valid_identifier(yytext)) return(IDENTIFIER); else REJECT; } -{letter}({letter}|{digit}|_|"."|"-")* { return(USER_IDENTIFIER); } {digit}{digit}* { return(NUMBER); } {hexval}{0,4}":"{hexval}{0,4}":"({hexval}|":"|".")* { return(IPV6_ADDR); } {version}/([ \t\f]*;) { return(VERSION_IDENTIFIER); } From owner-p4-projects@FreeBSD.ORG Thu Jan 25 15:13:45 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21D1616A402; Thu, 25 Jan 2007 15:13:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D804116A404 for ; Thu, 25 Jan 2007 15:13:44 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BBCE513C459 for ; Thu, 25 Jan 2007 15:13:44 +0000 (UTC) (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 l0PFDiF3054654 for ; Thu, 25 Jan 2007 15:13:44 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0PFDii7054649 for perforce@freebsd.org; Thu, 25 Jan 2007 15:13:44 GMT (envelope-from millert@freebsd.org) Date: Thu, 25 Jan 2007 15:13:44 GMT Message-Id: <200701251513.l0PFDii7054649@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 113510 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2007 15:13:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=113510 Change 113510 by millert@millert_macbook on 2007/01/25 15:13:13 Update to libsemanage-1.10.0 from the NSA web site. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/ChangeLog#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/VERSION#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/Makefile#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/conf-parse.y#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/conf-scan.l#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/direct_api.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/parse_utils.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/semanage_conf.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/semanage_store.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/ChangeLog#5 (text+ko) ==== @@ -1,3 +1,17 @@ +1.10.0 2007-01-18 + * Updated version for stable branch. + +1.9.2 2007-01-08 + * Merged patch to optionally reduce disk usage by removing + the backup module store and linked policy from Karl MacMillan + * Merged patch to correctly propagate return values in libsemanage + +1.9.1 2006-11-27 + * Merged patch to compile wit -fPIC instead of -fpic from + Manoj Srivastava to prevent hitting the global offest table + limit. Patch changed to include libselinux and libsemanage in + addition to libsepol. + 1.8 2006-10-17 * Updated version for release. ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/VERSION#5 (text+ko) ==== @@ -1,1 +1,1 @@ -1.8 +1.10.0 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/Makefile#6 (text+ko) ==== @@ -1,6 +1,6 @@ include ../../../../Makeconfig -CFLAGS += -Wall -I../include -I../../libselinux/include -I../../libsepol/include +CFLAGS += -Wall -I../include -I../../libselinux/include -I../../libsepol/include -I../../libsecompat LFLAGS = -s YFLAGS = -d ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/conf-parse.y#4 (text+ko) ==== @@ -55,7 +55,7 @@ char *s; } -%token MODULE_STORE VERSION EXPAND_CHECK FILE_MODE +%token MODULE_STORE VERSION EXPAND_CHECK FILE_MODE SAVE_PREVIOUS SAVE_LINKED %token LOAD_POLICY_START SETFILES_START GENHOMEDIRCON_START %token VERIFY_MOD_START VERIFY_LINKED_START VERIFY_KERNEL_START BLOCK_END %token PROG_PATH PROG_ARGS @@ -77,6 +77,8 @@ | version | expand_check | file_mode + | save_previous + | save_linked ; module_store: MODULE_STORE '=' ARG { @@ -111,6 +113,30 @@ } ; +save_previous: SAVE_PREVIOUS '=' ARG { + if (strcasecmp($3, "true") == 0) + current_conf->save_previous = 1; + else if (strcasecmp($3, "false") == 0) + current_conf->save_previous = 0; + else { + yyerror("save-previous can only be 'true' or 'false'"); + } + } + ; + + +save_linked: SAVE_LINKED '=' ARG { + if (strcasecmp($3, "true") == 0) + current_conf->save_linked = 1; + else if (strcasecmp($3, "false") == 0) + current_conf->save_linked = 0; + else { + yyerror("save-linked can only be 'true' or 'false'"); + } + } + ; + + command_block: command_start external_opts BLOCK_END { if (new_external->path == NULL) { @@ -186,6 +212,9 @@ conf->expand_check = 1; conf->file_mode = 0644; + conf->save_previous = 0; + conf->save_linked = 0; + if ((conf->load_policy = calloc(1, sizeof(*(current_conf->load_policy)))) == NULL) { return -1; @@ -283,6 +312,7 @@ int semanage_error(char *msg) { + fprintf(stderr, "error parsing semanage configuration file: %s\n", msg); parse_errors++; return 0; } ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/conf-scan.l#4 (text+ko) ==== @@ -42,6 +42,8 @@ policy-version return VERSION; expand-check return EXPAND_CHECK; file-mode return FILE_MODE; +save-previous return SAVE_PREVIOUS; +save-linked return SAVE_LINKED; "[load_policy]" return LOAD_POLICY_START; "[setfiles]" return SETFILES_START; "[genhomedircon]" return GENHOMEDIRCON_START; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/direct_api.c#4 (text+ko) ==== @@ -465,9 +465,11 @@ /* Before we do anything else, flush the join to its component parts. * This *does not* flush to disk automatically */ - if (users->dtable->is_modified(users->dbase) && - users->dtable->flush(sh, users->dbase) < 0) - goto cleanup; + if (users->dtable->is_modified(users->dbase)) { + retval = users->dtable->flush(sh, users->dbase); + if (retval < 0) + goto cleanup; + } /* Decide if anything was modified */ fcontexts_modified = fcontexts->dtable->is_modified(fcontexts->dbase); @@ -495,85 +497,117 @@ /* =================== Module expansion =============== */ /* link all modules in the sandbox to the base module */ - if (semanage_get_modules_names - (sh, &mod_filenames, &num_modfiles) != 0 - || semanage_verify_modules(sh, mod_filenames, - num_modfiles) == -1 - || semanage_link_sandbox(sh, &base) < 0) { + retval = semanage_get_modules_names(sh, &mod_filenames, &num_modfiles); + if (retval < 0) + goto cleanup; + retval = semanage_verify_modules(sh, mod_filenames, num_modfiles); + if (retval < 0) + goto cleanup; + retval = semanage_link_sandbox(sh, &base); + if (retval < 0) goto cleanup; - } - /* write the linked base */ - if ((linked_filename = - semanage_path(SEMANAGE_TMP, SEMANAGE_LINKED)) == NULL - || semanage_write_module(sh, linked_filename, base) == -1 - || semanage_verify_linked(sh) != 0) { + /* write the linked base if we want to save or we have a + * verification program that wants it. */ + linked_filename = semanage_path(SEMANAGE_TMP, SEMANAGE_LINKED); + if (linked_filename == NULL) { + retval = -1; goto cleanup; } + if (sh->conf->save_linked || sh->conf->linked_prog) { + retval = semanage_write_module(sh, linked_filename, base); + if (retval < 0) + goto cleanup; + retval = semanage_verify_linked(sh); + if (retval < 0) + goto cleanup; + /* remove the linked policy if we only wrote it for the + * verification program. */ + if (!sh->conf->save_linked) { + retval = unlink(linked_filename); + if (retval < 0) { + ERR(sh, "could not remove linked base %s", + linked_filename); + goto cleanup; + } + } + } else { + /* Try to delete the linked copy - this is needed if + * the save_link option has changed to prevent the + * old linked copy from being copied forever. No error + * checking is done because this is likely to fail because + * the file does not exist - which is not an error. */ + unlink(linked_filename); + } /* ==================== File-backed ================== */ /* File Contexts */ /* Sort the file contexts. */ - if (semanage_fc_sort - (sh, sepol_module_package_get_file_contexts(base), - sepol_module_package_get_file_contexts_len(base), - &sorted_fc_buffer, &sorted_fc_buffer_len) == -1) { + retval = semanage_fc_sort(sh, sepol_module_package_get_file_contexts(base), + sepol_module_package_get_file_contexts_len(base), + &sorted_fc_buffer, &sorted_fc_buffer_len); + if (retval < 0) goto cleanup; - } /* Write the contexts (including template contexts) to a single file. * The buffer returned by the sort function has a trailing \0 character, * which we do NOT want to write out to disk, so we pass sorted_fc_buffer_len-1. */ - if ((ofilename = - semanage_path(SEMANAGE_TMP, SEMANAGE_FC_TMPL)) == NULL - || write_file(sh, ofilename, sorted_fc_buffer, - sorted_fc_buffer_len - 1) == -1) { + ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_FC_TMPL); + if (ofilename == NULL) { + retval = -1; goto cleanup; } + retval = write_file(sh, ofilename, sorted_fc_buffer, + sorted_fc_buffer_len - 1); + if (retval < 0) + goto cleanup; /* Split complete and template file contexts into their separate files. */ - if (semanage_split_fc(sh)) + retval = semanage_split_fc(sh); + if (retval < 0) goto cleanup; pfcontexts->dtable->drop_cache(pfcontexts->dbase); /* Seusers */ if (sepol_module_package_get_seusers_len(base)) { - if ((ofilename = - semanage_path(SEMANAGE_TMP, - SEMANAGE_SEUSERS)) == NULL - || write_file(sh, ofilename, - sepol_module_package_get_seusers - (base), - sepol_module_package_get_seusers_len - (base)) == -1) { + ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_SEUSERS); + if (ofilename == NULL) { + retval = -1; goto cleanup; } + retval = write_file(sh, ofilename, + sepol_module_package_get_seusers(base), + sepol_module_package_get_seusers_len(base)); + if (retval < 0) + goto cleanup; + pseusers->dtable->drop_cache(pseusers->dbase); } else { - if (pseusers->dtable->clear(sh, pseusers->dbase) < 0) + retval = pseusers->dtable->clear(sh, pseusers->dbase); + if (retval < 0) goto cleanup; } /* Users_extra */ if (sepol_module_package_get_user_extra_len(base)) { - if ((ofilename = - semanage_path(SEMANAGE_TMP, - SEMANAGE_USERS_EXTRA)) == NULL - || write_file(sh, ofilename, - sepol_module_package_get_user_extra - (base), - sepol_module_package_get_user_extra_len - (base)) == -1) { + ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_USERS_EXTRA); + if (ofilename == NULL) { + retval = -1; goto cleanup; } + retval = write_file(sh, ofilename, + sepol_module_package_get_user_extra(base), + sepol_module_package_get_user_extra_len(base)); + if (retval < 0) + goto cleanup; pusers_extra->dtable->drop_cache(pusers_extra->dbase); } else { - if (pusers_extra->dtable-> - clear(sh, pusers_extra->dbase) < 0) + retval = pusers_extra->dtable->clear(sh, pusers_extra->dbase); + if (retval < 0) goto cleanup; } @@ -601,7 +635,8 @@ /* Create new policy object, then attach to policy databases * that work with a policydb */ - if (semanage_expand_sandbox(sh, base, &out) < 0) + retval = semanage_expand_sandbox(sh, base, &out); + if (retval < 0) goto cleanup; dbase_policydb_attach((dbase_policydb_t *) pusers_base->dbase, @@ -613,13 +648,16 @@ /* ============= Apply changes, and verify =============== */ - if (semanage_base_merge_components(sh) < 0) + retval = semanage_base_merge_components(sh); + if (retval < 0) goto cleanup; - if (semanage_write_policydb(sh, out) < 0) + retval = semanage_write_policydb(sh, out); + if (retval < 0) goto cleanup; - if (semanage_verify_kernel(sh) != 0) + retval = semanage_verify_kernel(sh); + if (retval < 0) goto cleanup; } @@ -633,26 +671,30 @@ * merged into the main file_contexts. We won't check the * large file_contexts - checked at compile time */ if (sh->do_rebuild || modified || fcontexts_modified) { - if (semanage_fcontext_validate_local(sh, out) < 0) + retval = semanage_fcontext_validate_local(sh, out); + if (retval < 0) goto cleanup; } /* Validate local seusers against policy */ if (sh->do_rebuild || modified || seusers_modified) { - if (semanage_seuser_validate_local(sh, out) < 0) + retval = semanage_seuser_validate_local(sh, out); + if (retval < 0) goto cleanup; } /* Validate local ports for overlap */ if (sh->do_rebuild || ports_modified) { - if (semanage_port_validate_local(sh) < 0) + retval = semanage_port_validate_local(sh); + if (retval < 0) goto cleanup; } /* ================== Write non-policydb components ========= */ /* Commit changes to components */ - if (semanage_commit_components(sh) < 0) + retval = semanage_commit_components(sh); + if (retval < 0) goto cleanup; retval = semanage_install_sandbox(sh); ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/parse_utils.c#3 (text+ko) ==== @@ -6,6 +6,7 @@ #include #include #include +#include #include "parse_utils.h" #include "debug.h" ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/semanage_conf.h#3 (text+ko) ==== @@ -35,6 +35,8 @@ int server_port; int policyvers; /* version for server generated policies */ int expand_check; + int save_previous; + int save_linked; mode_t file_mode; struct external_prog *load_policy; struct external_prog *setfiles; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/semanage_store.c#5 (text+ko) ==== @@ -53,6 +53,7 @@ #include #include #include +#include #include "debug.h" @@ -1223,6 +1224,14 @@ goto cleanup; } + if (!sh->conf->save_previous) { + retval = semanage_remove_directory(backup); + if (retval < 0) { + ERR(sh, "Could not delete previous directory %s.", backup); + goto cleanup; + } + } + cleanup: semanage_release_active_lock(sh); return retval; From owner-p4-projects@FreeBSD.ORG Thu Jan 25 15:18:53 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9352E16A404; Thu, 25 Jan 2007 15:18:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 55FB616A402 for ; Thu, 25 Jan 2007 15:18:53 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 44E4613C45D for ; Thu, 25 Jan 2007 15:18:53 +0000 (UTC) (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 l0PFIrwb055132 for ; Thu, 25 Jan 2007 15:18:53 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0PFIpju055129 for perforce@freebsd.org; Thu, 25 Jan 2007 15:18:51 GMT (envelope-from millert@freebsd.org) Date: Thu, 25 Jan 2007 15:18:51 GMT Message-Id: <200701251518.l0PFIpju055129@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 113511 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2007 15:18:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=113511 Change 113511 by millert@millert_macbook on 2007/01/25 15:18:19 Update to policycoreutils-1.34.1 from the NSA web site. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/ChangeLog#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/VERSION#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/Makefile#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/audit2allow#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/audit2allow.1#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/avc.py#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/load_policy/load_policy.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/load_policy/load_policy.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/newrole/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/newrole/newrole-lspp.pamd#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/newrole/newrole.1#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/newrole/newrole.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/POTFILES.in#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/af.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/am.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ar.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/as.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/be.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/bg.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/bn.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/bn_IN.po#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ca.po#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/cs.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/cy.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/da.po#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/de.po#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/el.po#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/en_GB.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/es.po#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/et.po#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/eu_ES.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/fa.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/fi.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/fr.po#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/gl.po#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/gu.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/he.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/hi.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/hr.po#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/hu.po#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/hy.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/id.po#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/is.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/it.po#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ja.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ka.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/kn.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ko.po#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ku.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/lo.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/lt.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/lv.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/mk.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ml.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/mr.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ms.po#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/my.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/nb.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/nl.po#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/nn.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/no.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/nso.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/or.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/pa.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/pl.po#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/policycoreutils.pot#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/pt.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/pt_BR.po#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ro.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ru.po#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/si.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/sk.po#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/sl.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/sq.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/sr%40Latn.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/sr.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/sv.po#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ta.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/te.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/th.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/tr.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/uk.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ur.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/vi.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/zh_CN.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/zh_TW.po#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/zu.po#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecon/restorecon.8#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecond/restorecond.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecond/restorecond.conf#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/run_init/run_init.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/run_init/run_init.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/scripts/chcat.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/scripts/fixfiles#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/scripts/fixfiles.8#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/scripts/genhomedircon#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/scripts/genhomedircon.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/secon/secon.1#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semanage/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semanage/semanage#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semanage/semanage.8#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semanage/seobject.py#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule/semodule.8#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule/semodule.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule_deps/semodule_deps.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule_expand/semodule_expand.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/setfiles/setfiles.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/setsebool/setsebool.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/ChangeLog#5 (text+ko) ==== @@ -1,3 +1,74 @@ +1.34.1 2007-01-22 + * Fixed newrole non-pam build. + +1.34.0 2007-01-18 + * Updated version for stable branch. + +1.33.16 2007-01-18 + * Merged po file updates from Dan Walsh. + * Removed update-po from all target in po/Makefile. + +1.33.15 2007-01-17 + * Merged unicode-to-string fix for seobject audit from Dan Walsh. + * Merged man page updates to make "apropos selinux" work from Dan Walsh. + +1.33.14 2007-01-16 + * Merged newrole man page patch from Michael Thompson. + +1.33.13 2007-01-16 + * Merged patch to fix python unicode problem from Dan Walsh. + +1.33.12 2007-01-11 + * Merged newrole securetty check from Dan Walsh. + * Merged semodule patch to generalize list support from Karl MacMillan. + +1.33.11 2007-01-09 + * Merged fixfiles and seobject fixes from Dan Walsh. + * Merged semodule support for list of modules after -i from Karl MacMillan. + +1.33.10 2007-01-08 + * Merged patch to correctly handle a failure during semanage handle + creation from Karl MacMillan. + +1.33.9 2007-01-05 + * Merged patch to fix seobject role modification from Dan Walsh. + +1.33.8 2007-01-04 + * Merged patches from Dan Walsh to: + - omit the optional name from audit2allow + - use the installed python version in the Makefiles + - re-open the tty with O_RDWR in newrole + +1.33.7 2007-01-03 + * Patch from Dan Walsh to correctly suppress warnings in load_policy. + +1.33.6 2006-11-29 + * Patch from Dan Walsh to add an pam_acct_msg call to run_init + * Patch from Dan Walsh to fix error code returns in newrole + * Patch from Dan Walsh to remove verbose flag from semanage man page + * Patch from Dan Walsh to make audit2allow use refpolicy Makefile + in /usr/share/selinux/ + +1.33.5 2006-11-27 + * Merged patch from Michael C Thompson to clean up genhomedircon + error handling. +1.33.4 2006-11-21 + * Merged po file updates from Dan Walsh. + +1.33.3 2006-11-21 + * Merged setsebool patch from Karl MacMillan. + This fixes a bug reported by Yuichi Nakamura with + always setting booleans persistently on an unmanaged system. + +1.33.2 2006-11-20 + * Merged patch from Dan Walsh (via Karl MacMillan): + * Added newrole audit message on login failure + * Add /var/log/wtmp to restorecond.conf watch list + * Fix genhomedircon, semanage, semodule_expand man pages. + +1.33.1 2006-11-13 + * Merged newrole patch set from Michael Thompson. + 1.32 2006-10-17 * Updated version for release. ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/VERSION#5 (text+ko) ==== @@ -1,1 +1,1 @@ -1.32 +1.34.1 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/Makefile#4 (text+ko) ==== @@ -6,8 +6,8 @@ LIBDIR = $(PREFIX)/lib MANDIR = $(PREFIX)/share/man LOCALEDIR ?= /usr/share/locale -PYLIBVER ?= python2.3 -PYTHONLIBDIR ?= $(DESTDIR)/System/Library/Frameworks/Python.framework/Versions/2.3/lib/$(PYLIBVER) +PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]') +PYTHONLIBDIR ?= $(DESTDIR)$(shell python -c 'import sys;print sys.path[2]') TARGETS=audit2allow ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/audit2allow#4 (text+ko) ==== @@ -29,6 +29,7 @@ if __name__ == '__main__': import commands, sys, os, getopt, selinux import gettext + import re try: gettext.install('policycoreutils') except: @@ -59,6 +60,11 @@ print msg sys.exit(1) + def verify_module(module): + m = re.findall("[^a-zA-Z0-9]", module) + if len(m) != 0: + usage(_("Alphanumeric Charaters Only")) + def errorExit(error): sys.stderr.write("%s: " % sys.argv[0]) sys.stderr.write("%s\n" % error) @@ -125,10 +131,12 @@ if module != "" or a[0] == "-": usage() module = a + verify_module(module) if o == "-M": if module != "" or output_ind or a[0] == "-": usage() module = a + verify_module(module) outfile = a+".te" buildPP = 1 if not os.path.exists("/usr/bin/checkmodule"): @@ -184,22 +192,27 @@ 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") - print cmd - 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) - + if ref_ind: + rc, type = selinux.selinux_getpolicytype() + cmd = "make -f /usr/share/selinux/%s/include/Makefile %s.pp" % (type, module) + print _("Compiling policy") + print cmd + rc = commands.getstatusoutput(cmd) + else: + 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: - 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]) + 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) else: errorExit(rc[1]) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/audit2allow.1#3 (text+ko) ==== @@ -24,7 +24,7 @@ .\" .TH AUDIT2ALLOW "1" "January 2005" "Security Enhanced Linux" NSA .SH NAME -audit2allow \- generate policy allow rules from logs of denied operations +audit2allow \- generate SELinux policy allow rules from logs of denied operations .SH SYNOPSIS .B audit2allow .RI [ options "] " ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/avc.py#3 (text+ko) ==== @@ -231,7 +231,7 @@ else: file = m[0][1] ret = "\n#%s\n"% self.out() - ret += "optional_policy(`%s', `\n" % m[0][1] + ret += "optional_policy(`\n" first = True for i in m: if file != i[1]: ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/load_policy/load_policy.8#2 (text+ko) ==== @@ -1,6 +1,6 @@ .TH LOAD_POLICY "8" "May 2003" "Security Enhanced Linux" NSA .SH NAME -load_policy \- load a new policy into the kernel +load_policy \- load a new SELinux policy into the kernel .SH SYNOPSIS .B load_policy ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/load_policy/load_policy.c#4 (text+ko) ==== @@ -51,12 +51,12 @@ nargs = argc - optind; if (nargs > 2) usage(argv[0]); - if (nargs >= 1) { - fprintf(stderr, - "%s: Warning! Policy file argument (%s) is no longer supported, installed policy is always loaded. Continuing...\n", - argv[0], argv[optind++]); + if (nargs >= 1 && !quiet) { + fprintf(stderr, + "%s: Warning! Policy file argument (%s) is no longer supported, installed policy is always loaded. Continuing...\n", + argv[0], argv[optind++]); } - if (nargs == 2) { + if (nargs == 2 && ! quiet) { fprintf(stderr, "%s: Warning! Boolean file argument (%s) is no longer supported, installed booleans file is always used. Continuing...\n", argv[0], argv[optind++]); ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/newrole/Makefile#3 (text+ko) ==== @@ -6,10 +6,18 @@ LOCALEDIR = /usr/share/locale PAMH = $(shell ls /usr/include/security/pam_appl.h 2>/dev/null) AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null) -# If LOG_AUDIT_PRIV is y, then newrole will be made into setuid root program. -# This is so that we have the CAP_AUDIT_WRITE capability. newrole will -# shed all privileges and change to the user's uid. -LOG_AUDIT_PRIV ?= n +# Enable capabilities to permit newrole to generate audit records. +# This will make newrole a setuid root program. +# The capabilities used are: CAP_AUDIT_WRITE. +AUDIT_LOG_PRIV ?= n +# Enable capabilities to permit newrole to utilitize the pam_namespace module. +# This will make newrole a setuid root program. +# The capabilities used are: CAP_SYS_ADMIN, CAP_CHOWN, CAP_FOWNER and +# CAP_DAC_OVERRIDE. +NAMESPACE_PRIV ?= n +# If LSPP_PRIV is y, then newrole will be made into setuid root program. +# Enabling this option will force AUDIT_LOG_PRIV and NAMESPACE_PRIV to be y. +LSPP_PRIV ?= n VERSION = $(shell cat ../VERSION) CFLAGS ?= -Werror -Wall -W @@ -26,12 +34,23 @@ override CFLAGS += -DUSE_AUDIT LDLIBS += -laudit endif -ifeq (${LOG_AUDIT_PRIV},y) - override CFLAGS += -DLOG_AUDIT_PRIV +ifeq (${LSPP_PRIV},y) + override AUDIT_LOG_PRIV=y + override NAMESPACE_PRIV=y +endif +ifeq (${AUDIT_LOG_PRIV},y) + override CFLAGS += -DAUDIT_LOG_PRIV + IS_SUID=y +endif +ifeq (${NAMESPACE_PRIV},y) + override CFLAGS += -DNAMESPACE_PRIV + IS_SUID=y +endif +ifeq (${IS_SUID},y) + MODE := 4555 LDLIBS += -lcap - MODE := 4555 else - MODE := 555 + MODE := 0555 endif TARGETS=$(patsubst %.c,%,$(wildcard *.c)) @@ -46,8 +65,12 @@ install -m 644 newrole.1 $(MANDIR)/man1/ ifeq (${PAMH}, /usr/include/security/pam_appl.h) test -d $(ETCDIR)/pam.d || install -m 755 -d $(ETCDIR)/pam.d +ifeq (${LSPP_PRIV},y) + install -m 644 newrole-lspp.pamd $(ETCDIR)/pam.d/newrole +else install -m 644 newrole.pamd $(ETCDIR)/pam.d/newrole endif +endif clean: rm -f $(TARGETS) *.o ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/newrole/newrole.1#2 (text+ko) ==== @@ -1,6 +1,6 @@ .TH NEWROLE "1" "October 2000" "Security Enhanced Linux" NSA .SH NAME -newrole \- run a shell with a new role +newrole \- run a shell with a new SELinux role .SH SYNOPSIS .B newrole [\fB-r\fR|\fB--role\fR] @@ -57,16 +57,46 @@ .B --version shows the current version of newrole .PP +.SH EXAMPLE +.br +Changing role: + # id -Z + staff_u:staff_r:staff_t:SystemLow-SystemHigh + # newrole -r sysadm_r + # id -Z + staff_u:sysadm_r:sysadm_t:SystemLow-SystemHigh + +Changing sensitivity only: + # id -Z + staff_u:sysadm_r:sysadm_t:Unclassified-SystemHigh + # newrole -l Secret + # id -Z + staff_u:sysadm_r:sysadm_t:Secret-SystemHigh + +.PP +Changing sensitivity and clearance: + # id -Z + staff_u:sysadm_r:sysadm_t:Unclassified-SystemHigh + # newrole -l Secret-Secret + # id -Z + staff_u:sysadm_r:sysadm_t:Secret + .SH FILES /etc/passwd - user account information .br /etc/shadow - encrypted passwords and age information +.br +/etc/selinux//contexts/default_type - default types for roles +/etc/selinux//contexts/securetty_types - securetty types for level changes +.br .SH SEE ALSO -.B su -(1), -.B runas +.B runcon (1) .SH AUTHORS .nf -Tim Fraser (tfraser@tislabs.com) -Anthony Colatrella (amcolat@epoch.ncsc.mil) +Anthony Colatrella +Tim Fraser +Steve Grubb +Darrel Goeddel +Michael Thompson +Dan Walsh ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/newrole/newrole.c#5 (text+ko) ==== @@ -36,18 +36,25 @@ * setuid root, so that it can read the shadow passwd file. * * - * option CANTSPELLGDB: - * - * If you set CANTSPELLGDB you will turn on some debugging printfs. - * + * Authors: + * Anthony Colatrella + * Tim Fraser + * Steve Grubb + * Darrel Goeddel + * Michael Thompson + * Dan Walsh * - * Authors: Tim Fraser , - * Anthony Colatrella - * Various bug fixes by Stephen Smalley - * *************************************************************************/ #define _GNU_SOURCE + +#if defined(AUDIT_LOG_PRIV) && !defined(USE_AUDIT) +#error AUDIT_LOG_PRIV needs the USE_AUDIT option +#endif +#if defined(NAMESPACE_PRIV) && !defined(USE_PAM) +#error NAMESPACE_PRIV needs the USE_PAM option +#endif + #include #include /* for malloc(), realloc(), free() */ #include /* for getpwuid() */ @@ -64,13 +71,11 @@ #include /* for SELINUX_DEFAULTUSER */ #include #include +#include /* for getuid(), exit(), getopt() */ #ifdef USE_AUDIT #include #endif -#ifdef LOG_AUDIT_PRIV -#ifndef USE_AUDIT -#error LOG_AUDIT_PRIV needs the USE_AUDIT option -#endif +#if defined(AUDIT_LOG_PRIV) || (NAMESPACE_PRIV) #include #include #endif @@ -86,24 +91,24 @@ #endif /* USAGE_STRING describes the command-line args of this program. */ -#define USAGE_STRING "USAGE: newrole [ -r role ] [ -t type ] [ -l level ] [ -V ] [ -- args ]" +#define USAGE_STRING "USAGE: newrole [ -r role ] [ -t type ] [ -l level ] [ -p ] [ -V ] [ -- args ]" +#define DEFAULT_PATH "/usr/bin:/bin" #define DEFAULT_CONTEXT_SIZE 255 /* first guess at context size */ extern char **environ; -char *xstrdup(const char *s) -{ - char *s2; - - s2 = strdup(s); - if (!s2) { - fprintf(stderr, _("Out of memory!\n")); - exit(1); - } - return s2; -} - +/** + * Construct from the current range and specified desired level a resulting + * range. If the specified level is a range, return that. If it is not, then + * construct a range with level as the sensitivity and clearance of the current + * context. + * + * newlevel - the level specified on the command line + * range - the range in the current context + * + * Returns malloc'd memory + */ static char *build_new_range(char *newlevel, const char *range) { char *newrangep = NULL; @@ -120,9 +125,8 @@ return newrangep; } - /* look for MLS range */ + /* look for MLS range in current context */ tmpptr = strchr(range, '-'); - if (tmpptr) { /* we are inserting into a ranged MLS context */ len = strlen(newlevel) + 1 + strlen(tmpptr + 1) + 1; @@ -153,16 +157,11 @@ * All PAM code goes in this section. * ************************************************************************/ - -#include /* for getuid(), exit(), getopt() */ - #include /* for PAM functions */ #include /* for misc_conv PAM utility function */ #define SERVICE_NAME "newrole" /* the name of this program for PAM */ -int authenticate_via_pam(const struct passwd *, const char *); - /* authenticate_via_pam() * * in: pw - struct containing data from our user's line in @@ -176,63 +175,39 @@ * This function uses PAM to authenticate the user running this * program. This is the only function in this program that makes PAM * calls. - * */ - -int authenticate_via_pam(const struct passwd *pw, const char *ttyn) +int authenticate_via_pam(const char *ttyn, pam_handle_t *pam_handle) { - int result = 0; /* our result, set to 0 (not authenticated) by default */ - int rc; /* pam return code */ - pam_handle_t *pam_handle; /* opaque handle used by all PAM functions */ + int result = 0; /* set to 0 (not authenticated) by default */ + int pam_rc; /* pam return code */ const char *tty_name; - /* This is a jump table of functions for PAM to use when it wants to * - * communicate with the user. We'll be using misc_conv(), which is * - * provided for us via pam_misc.h. */ - struct pam_conv pam_conversation = { - misc_conv, - NULL - }; - - /* Make `p_pam_handle' a valid PAM handle so we can use it when * - * calling PAM functions. */ - rc = pam_start(SERVICE_NAME, - pw->pw_name, &pam_conversation, &pam_handle); - if (rc != PAM_SUCCESS) { - fprintf(stderr, _("failed to initialize PAM\n")); - exit(-1); - } - if (strncmp(ttyn, "/dev/", 5) == 0) tty_name = ttyn + 5; else tty_name = ttyn; - rc = pam_set_item(pam_handle, PAM_TTY, tty_name); - if (rc != PAM_SUCCESS) { + pam_rc = pam_set_item(pam_handle, PAM_TTY, tty_name); + if (pam_rc != PAM_SUCCESS) { fprintf(stderr, _("failed to set PAM_TTY\n")); goto out; } /* Ask PAM to authenticate the user running this program */ - rc = pam_authenticate(pam_handle, 0); - if (rc != PAM_SUCCESS) { + pam_rc = pam_authenticate(pam_handle, 0); + if (pam_rc != PAM_SUCCESS) { goto out; } /* Ask PAM to verify acct_mgmt */ - rc = pam_acct_mgmt(pam_handle, 0); - if (rc == PAM_SUCCESS) { + pam_rc = pam_acct_mgmt(pam_handle, 0); + if (pam_rc == PAM_SUCCESS) { result = 1; /* user authenticated OK! */ } - /* We're done with PAM. Free `pam_handle'. */ out: - pam_end(pam_handle, rc); - - return (result); - + return result; } /* authenticate_via_pam() */ #else /* else !USE_PAM */ @@ -242,19 +217,14 @@ * All shadow passwd code goes in this section. * ************************************************************************/ - -#include /* for getuid(), exit(), crypt() */ #include /* for shadow passwd functions */ #include /* for strlen(), memset() */ #define PASSWORD_PROMPT _("Password:") /* prompt for getpass() */ -int authenticate_via_shadow_passwd(const struct passwd *); - /* authenticate_via_shadow_passwd() * - * in: pw - struct containing data from our user's line in - * the passwd file. + * in: uname - the calling user's user name * out: nothing * return: value condition * ----- --------- @@ -264,51 +234,37 @@ * * This function uses the shadow passwd file to thenticate the user running * this program. - * */ - -int authenticate_via_shadow_passwd(const struct passwd *pw) +int authenticate_via_shadow_passwd(const char *uname) { + struct spwd *p_shadow_line; + char *unencrypted_password_s; + char *encrypted_password_s; - struct spwd *p_shadow_line; /* struct derived from shadow passwd file line */ - char *unencrypted_password_s; /* unencrypted password input by user */ - char *encrypted_password_s; /* user's password input after being crypt()ed */ - - /* Make `p_shadow_line' point to the data from the current user's * - * line in the shadow passwd file. */ - setspent(); /* Begin access to the shadow passwd file. */ - p_shadow_line = getspnam(pw->pw_name); - endspent(); /* End access to the shadow passwd file. */ + setspent(); + p_shadow_line = getspnam(uname); + endspent(); if (!(p_shadow_line)) { - fprintf(stderr, - _ - ("Cannot find your entry in the shadow passwd file.\n")); - exit(-1); + fprintf(stderr, _("Cannot find your entry in the shadow " + "passwd file.\n")); + return 0; } /* Ask user to input unencrypted password */ if (!(unencrypted_password_s = getpass(PASSWORD_PROMPT))) { fprintf(stderr, _("getpass cannot open /dev/tty\n")); - exit(-1); + return 0; } - /* Use crypt() to encrypt user's input password. Clear the * - * unencrypted password as soon as we're done, so it is not * - * visible to memory snoopers. */ + /* Use crypt() to encrypt user's input password. */ encrypted_password_s = crypt(unencrypted_password_s, p_shadow_line->sp_pwdp); memset(unencrypted_password_s, 0, strlen(unencrypted_password_s)); - - /* Return 1 (authenticated) iff the encrypted version of the user's * - * input password matches the encrypted password stored in the * - * shadow password file. */ return (!strcmp(encrypted_password_s, p_shadow_line->sp_pwdp)); - -} /* authenticate_via_shadow_passwd() */ - +} #endif /* if/else USE_PAM */ -/* +/** * This function checks to see if the shell is known in /etc/shells. * If so, it returns 1. On error or illegal shell, it returns 0. */ @@ -317,7 +273,7 @@ int found = 0; const char *buf; - if (!shell_name) + if (! (shell_name && shell_name[0])) return found; while ((buf = getusershell()) != NULL) { @@ -335,71 +291,287 @@ return found; } -/* +/** + * Determine the Linux user identity to re-authenticate. + * If supported and set, use the login uid, as this should be more stable. + * Otherwise, use the real uid. + * + * This function assigns malloc'd memory into the pw_copy struct. + * Returns zero on success, non-zero otherwise + */ +int extract_pw_data(struct passwd *pw_copy) +{ + uid_t uid; + struct passwd *pw; + +#ifdef USE_AUDIT + uid = audit_getloginuid(); + if (uid == (uid_t) - 1) + uid = getuid(); +#else + uid = getuid(); +#endif + + setpwent(); + pw = getpwuid(uid); + endpwent(); + if (!(pw && pw->pw_name && pw->pw_name[0] && pw->pw_shell + && pw->pw_shell[0] && pw->pw_dir && pw->pw_dir[0])) { + fprintf(stderr, + _("cannot find valid entry in the passwd file.\n")); + return -1; + } + + *pw_copy = *pw; + pw = pw_copy; + pw->pw_name = strdup(pw->pw_name); + pw->pw_dir = strdup(pw->pw_dir); + pw->pw_shell = strdup(pw->pw_shell); + + if (! (pw->pw_name && pw->pw_dir && pw->pw_shell)) { + fprintf(stderr, _("Out of memory!\n")); + goto out_free; + } + + if (verify_shell(pw->pw_shell) == 0) { + fprintf(stderr, _("Error! Shell is not valid.\n")); + goto out_free; + } + return 0; + +out_free: + free(pw->pw_name); + free(pw->pw_dir); + free(pw->pw_shell); + return -1; +} + +/** + * Either restore the original environment, or set up a minimal one. + * + * The minimal environment contains: + * TERM, DISPLAY and XAUTHORITY - if they are set, preserve values + * HOME, SHELL, USER and LOGNAME - set to contents of /etc/passwd + * PATH - set to default value DEFAULT_PATH + * + * Returns zero on success, non-zero otherwise + */ +static int restore_environment(int preserve_environment, + char **old_environ, const struct passwd *pw) +{ + char const *term_env; + char const *display_env; + char const *xauthority_env; + char *term = NULL; /* temporary container */ + char *display = NULL; /* temporary container */ + char *xauthority = NULL; /* temporary container */ + int rc; + + environ = old_environ; + + if (preserve_environment) + return 0; + + term_env = getenv("TERM"); + display_env = getenv("DISPLAY"); + xauthority_env = getenv("XAUTHORITY"); + + /* Save the variable values we want */ + if (term_env) + term = strdup(term_env); + if (display_env) + display = strdup(display_env); + if (xauthority_env) + xauthority = strdup(xauthority_env); + if ((term_env && !term) || (display_env && !display) || + (xauthority_env && !xauthority)) { + rc = -1; + goto out; + } + + /* Construct a new environment */ + if ((rc = clearenv())) { + fprintf(stderr, _("Unable to clear environment\n")); + goto out; + } + + /* Restore that which we saved */ + if (term) + rc |= setenv("TERM", term, 1); + if (display) + rc |= setenv("DISPLAY", display, 1); + if (xauthority) + rc |= setenv("XAUTHORITY", xauthority, 1); + rc |= setenv("HOME", pw->pw_dir, 1); + rc |= setenv("SHELL", pw->pw_shell, 1); + rc |= setenv("USER", pw->pw_name, 1); + rc |= setenv("LOGNAME", pw->pw_name, 1); + rc |= setenv("PATH", DEFAULT_PATH, 1); +out: + free(term); + free(display); + free(xauthority); + return rc; +} + +/** * This function will drop the capabilities so that we are left * only with access to the audit system. If the user is root, we leave * the capabilities alone since they already should have access to the * audit netlink socket. + * + * Returns zero on success, non-zero otherwise */ -#ifdef LOG_AUDIT_PRIV -static void drop_capabilities(void) +#if defined(AUDIT_LOG_PRIV) && !defined(NAMESPACE_PRIV) +static int drop_capabilities(void) { + int rc = 0; + cap_t new_caps, tmp_caps; + cap_value_t cap_list[] = { CAP_AUDIT_WRITE }; + cap_value_t tmp_cap_list[] = { CAP_AUDIT_WRITE, CAP_SETUID }; uid_t uid = getuid(); - if (uid) { /* Non-root path */ - cap_t new_caps, tmp_caps; - cap_value_t cap_list[] = { CAP_AUDIT_WRITE }; - cap_value_t tmp_cap_list[] = { CAP_AUDIT_WRITE, CAP_SETUID }; + if (!uid) + return 0; + + /* Non-root caller, suid root path */ + new_caps = cap_init(); + tmp_caps = cap_init(); + if (!new_caps || !tmp_caps) { + fprintf(stderr, _("Error initing capabilities, aborting.\n")); + return -1; + } + rc |= cap_set_flag(new_caps, CAP_PERMITTED, 1, cap_list, CAP_SET); + rc |= cap_set_flag(new_caps, CAP_EFFECTIVE, 1, cap_list, CAP_SET); + rc |= cap_set_flag(tmp_caps, CAP_PERMITTED, 2, tmp_cap_list, CAP_SET); + rc |= cap_set_flag(tmp_caps, CAP_EFFECTIVE, 2, tmp_cap_list, CAP_SET); + if (rc) { + fprintf(stderr, _("Error setting capabilities, aborting\n")); + goto out; + } + + /* Keep capabilities across uid change */ + if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0)) { + fprintf(stderr, _("Error setting KEEPCAPS, aborting\n")); + rc = -1; + goto out; + } + + /* Does this temporary change really buy us much? */ + /* We should still have root's caps, so drop most capabilities now */ + if ((rc = cap_set_proc(tmp_caps))) { + fprintf(stderr, _("Error dropping capabilities, aborting\n")); + goto out; + } + + /* Change uid */ + if ((rc = setresuid(uid, uid, uid))) { + fprintf(stderr, _("Error changing uid, aborting.\n")); + goto out; + } + + /* Now get rid of this ability */ + if ((rc = prctl(PR_SET_KEEPCAPS, 0, 0, 0, 0) < 0)) { + fprintf(stderr, _("Error resetting KEEPCAPS, aborting\n")); + goto out; + } + + /* Finish dropping capabilities. */ + if ((rc = cap_set_proc(new_caps))) { + fprintf(stderr, + _("Error dropping SETUID capability, aborting\n")); + goto out; + } +out: + if (cap_free(tmp_caps) || cap_free(new_caps)) + fprintf(stderr, _("Error freeing caps\n")); + return rc; +} +#elif defined(NAMESPACE_PRIV) +/** + * This function will drop the capabilities so that we are left + * only with access to the audit system and the ability to raise + * CAP_SYS_ADMIN, CAP_DAC_OVERRIDE, CAP_FOWNER and CAP_CHOWN, + * before invoking pam_namespace. These capabilities are needed + * for performing bind mounts/unmounts and to create potential new + * instance directories with appropriate DAC attributes. If the + * user is root, we leave the capabilities alone since they already + * should have access to the audit netlink socket and should have + * the ability to create/mount/unmount instance directories. + * + * Returns zero on success, non-zero otherwise + */ +static int drop_capabilities(void) +{ + int rc = 0; + cap_t new_caps; + cap_value_t cap_list[] = { CAP_AUDIT_WRITE, CAP_SETUID, + CAP_SYS_ADMIN, CAP_FOWNER, CAP_CHOWN, + CAP_DAC_OVERRIDE }; + + if (!getuid()) + return 0; + + /* Non-root caller, suid root path */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 25 15:24:00 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 48A5616A406; Thu, 25 Jan 2007 15:24:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 248B516A404 for ; Thu, 25 Jan 2007 15:24:00 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 092AB13C478 for ; Thu, 25 Jan 2007 15:24:00 +0000 (UTC) (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 l0PFNxAG057153 for ; Thu, 25 Jan 2007 15:23:59 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0PFNxJZ057150 for perforce@freebsd.org; Thu, 25 Jan 2007 15:23:59 GMT (envelope-from millert@freebsd.org) Date: Thu, 25 Jan 2007 15:23:59 GMT Message-Id: <200701251523.l0PFNxJZ057150@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 113512 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2007 15:24:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=113512 Change 113512 by millert@millert_macbook on 2007/01/25 15:23:20 Adapt to MAC policy API changes. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/color/mac_color.c#12 edit .. //depot/projects/trustedbsd/sedarwin8/policies/console/mac_console.c#9 edit .. //depot/projects/trustedbsd/sedarwin8/policies/filewatch/mac_filewatch.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#27 edit .. //depot/projects/trustedbsd/sedarwin8/policies/readonly/mac_readonly.c#9 edit .. //depot/projects/trustedbsd/sedarwin8/policies/test/mac_parse.pl#4 edit .. //depot/projects/trustedbsd/sedarwin8/policies/test/mac_test.c#20 edit .. //depot/projects/trustedbsd/sedarwin8/policies/vanity/vanity.c#10 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/color/mac_color.c#12 (text+ko) ==== @@ -383,7 +383,7 @@ static int color_vnode_check_access(struct ucred *cred, struct vnode *vp, - struct label *label, int acc_mode) + struct label *label, struct componentname *cnp, int acc_mode) { return (co_maybe_promote_process(cred, label)); @@ -399,7 +399,7 @@ static int color_vnode_check_chroot(struct ucred *cred, struct vnode *dvp, - struct label *label) + struct label *label, struct componentname *cnp) { return (co_maybe_promote_process(cred, label)); @@ -443,7 +443,7 @@ static int color_vnode_check_exec(struct ucred *cred, struct vnode *vp, - struct label *label, struct label *execlabel) + struct label *label, struct label *execlabel, struct componentname *cnp) { if (execlabel != NULL) @@ -518,14 +518,6 @@ } static int -color_proc_check_mprotect(struct ucred *cred, struct proc *proc, - void *addr, size_t size, int prot) -{ - - // Nothing yet -} - -static int color_vnode_check_open(struct ucred *cred, struct vnode *vp, struct label *label, int acc_mode) { @@ -709,7 +701,6 @@ .mpo_lctx_notify_leave = color_lctx_notify_leave, .mpo_lctx_label_update = color_lctx_label_update, .mpo_proc_check_signal = color_proc_check_signal, - .mpo_proc_check_mprotect = color_proc_check_mprotect, .mpo_vnode_check_access = color_vnode_check_access, .mpo_vnode_check_chdir = color_vnode_check_chdir, ==== //depot/projects/trustedbsd/sedarwin8/policies/console/mac_console.c#9 (text+ko) ==== @@ -680,12 +680,32 @@ } static int +mac_console_vnode_check_access(struct ucred *cred, struct vnode *vp, + struct label *vnodelabel, struct componentname *cnp, int acc_mode) +{ + struct mac_console *subj, *obj; + + if (!mac_console_enabled) + return (0); + + subj = SLOT(cred->cr_label); + obj = SLOT(vnodelabel); + if (!mac_console_vnode_access(subj, obj)) + return (EACCES); + return (0); +} + +static int mac_console_vnode_check_exec(struct ucred *cred, struct vnode *vp, struct label *label, #ifdef __FreeBSD__ struct image_params *imgp, #endif - struct label *execlabel) + struct label *execlabel +#ifdef __APPLE__ + ,struct componentname *cnp +#endif + ) { struct mac_console *subj, *obj; @@ -776,7 +796,7 @@ .mpo_vnode_label_associate_extattr= mac_console_vnode_label_associate_extattr, .mpo_vnode_label_store = mac_console_vnode_label_store, - .mpo_vnode_check_access = mac_console_vnode_check_open, + .mpo_vnode_check_access = mac_console_vnode_check_access, .mpo_vnode_check_open = mac_console_vnode_check_open, .mpo_vnode_check_exec = mac_console_vnode_check_exec, .mpo_vnode_check_unlink = mac_console_vnode_check_unlink, ==== //depot/projects/trustedbsd/sedarwin8/policies/filewatch/mac_filewatch.c#2 (text+ko) ==== @@ -78,35 +78,27 @@ static int filewatch_vnode_check_exec(struct ucred *cred, struct vnode *vp, - struct label *label, struct label *execlabel) + struct label *label, struct label *execlabel, struct componentname *cnp) { char *pbuf, cbuf[MAXCOMLEN+1]; - int error, plen, clen; + int plen, clen; if (vp == NULL) { printf("filewatch:: NULL vp\n"); return (0); } - MALLOC_ZONE(pbuf, char *, MAXPATHLEN, M_NAMEI, M_WAITOK); - if (pbuf == NULL) { - printf("filewatch:: This sucks, no path buffers available (via exec)\n"); - return (0); - } + pbuf = cnp->cn_pnbuf; + plen = cnp->cn_nameptr - cnp->cn_pnbuf + cnp->cn_namelen; - plen = MAXPATHLEN; - error = vn_getpath(vp, pbuf, &plen); - - clen = MAXCOMLEN+1; + clen = sizeof(cbuf); proc_selfname(cbuf, clen); - printf("filewatch:: pcomm '%s' (%d/%d) uid %d exec '%s'\n", + printf("filewatch:: pcomm '%s' (%d/%d) uid %d exec '%.*s'\n", cbuf, proc_selfpid(), proc_selfppid(), cred->cr_uid, - pbuf); - - FREE_ZONE(pbuf, MAXPATHLEN, M_NAMEI); + plen, pbuf); return (0); } @@ -132,7 +124,7 @@ plen = MAXPATHLEN; error = vn_getpath(vp, pbuf, &plen); - clen = MAXCOMLEN+1; + clen = sizeof(cbuf); proc_selfname(cbuf, clen); printf("filewatch:: pcomm '%s' (%d/%d) uid %d open '%s' (%d,%s%s%s%s%s)\n", cbuf, ==== //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#27 (text+ko) ==== @@ -314,6 +314,7 @@ return (mac_mls_dominate_element(&a->mm_effective, &b->mm_effective)); } +#if 0 static int mac_mls_equal_element(struct mac_mls_element *a, struct mac_mls_element *b) { @@ -351,6 +352,7 @@ return (mac_mls_equal_element(&a->mm_effective, &b->mm_effective)); } +#endif static int mac_mls_contains_equal(struct mac_mls *mac_mls) @@ -1529,7 +1531,7 @@ static void mac_mls_mbuf_label_associate_bpfdesc(struct bpf_d *bpf_d, - struct mbuf *mbuf, struct label *mbuflabel) + struct label *bpflabel, struct mbuf *mbuf, struct label *mbuflabel) { struct mac_mls *dest; @@ -3287,7 +3289,7 @@ static int mac_mls_vnode_check_chroot(struct ucred *cred, struct vnode *dvp, - struct label *dlabel) + struct label *dlabel, struct componentname *cnp) { struct mac_mls *subj, *obj; @@ -3389,7 +3391,7 @@ static int mac_mls_vnode_check_exec(struct ucred *cred, struct vnode *vp, - struct label *label, struct label *execlabel) + struct label *label, struct label *execlabel, struct componentname *cnp) { struct mac_mls *subj, *obj, *exec; int error; @@ -3613,7 +3615,7 @@ static int mac_mls_vnode_check_access(struct ucred *cred, struct vnode *vp, - struct label *vnodelabel, int acc_mode) + struct label *vnodelabel, struct componentname *cnp, int acc_mode) { struct mac_mls *subj, *obj; ==== //depot/projects/trustedbsd/sedarwin8/policies/readonly/mac_readonly.c#9 (text+ko) ==== @@ -371,7 +371,7 @@ } static int -readonly_vnode_check_access(struct ucred *cred, struct vnode *vp, struct label *label, int acc_mode) +readonly_vnode_check_access(struct ucred *cred, struct vnode *vp, struct label *label, struct componentname *cnp, int acc_mode) { return (ro_checkdiraccess(vp, label, acc_mode)); ==== //depot/projects/trustedbsd/sedarwin8/policies/test/mac_parse.pl#4 (text+ko) ==== @@ -207,9 +207,6 @@ elsif ($var =~ /port/ || $name =~ /check_port_/) { print CFILE "\tUSE_LABEL($var, PORTTYPE);\n"; } - elsif ($var =~ /task/) { - print CFILE "\tUSE_LABEL($var, TASKTYPE);\n"; - } elsif ($type =~ /struct label/) { if ($flags =~ /NULLOK/) { print CFILE "\tif ($var != NULL)\n\t"; @@ -217,6 +214,9 @@ if ($firsttype ne "") { print CFILE "\tUSE_LABEL($var, $firsttype);\n"; } + elsif ($var =~ /task/) { + print CFILE "\tUSE_LABEL($var, TASKTYPE);\n"; + } else { print CFILE "\tUSE_LABEL($var, $typename);\n"; } ==== //depot/projects/trustedbsd/sedarwin8/policies/test/mac_test.c#20 (text+ko) ==== @@ -1627,7 +1627,7 @@ static void mac_test_mbuf_label_associate_bpfdesc(struct bpf_d *bpf_d, - struct mbuf *m, struct label *m_label) + struct label *b_label, struct mbuf *m, struct label *m_label) { CHECKNULL(bpf_d); ==== //depot/projects/trustedbsd/sedarwin8/policies/vanity/vanity.c#10 (text+ko) ==== @@ -236,7 +236,7 @@ } static int -vanity_mount_check_mount(struct ucred *cred, struct vnode *vp, struct label *vlabel, const char *vfc_name) +vanity_mount_check_mount(struct ucred *cred, struct vnode *vp, struct label *vlabel, struct componentname *cnp, const char *vfc_name) { VANITY(vp); return (0); @@ -264,7 +264,7 @@ } static int -vanity_vnode_check_access(struct ucred *cred, struct vnode *vp, struct label *label, int acc_mode) +vanity_vnode_check_access(struct ucred *cred, struct vnode *vp, struct label *label, struct componentname *cnp, int acc_mode) { VANITY(vp); return (0); @@ -278,7 +278,7 @@ } static int -vanity_vnode_check_chroot(struct ucred *cred, struct vnode *dvp, struct label *dlabel) +vanity_vnode_check_chroot(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp) { VANITY(dvp); return (0); @@ -315,7 +315,7 @@ } static int -vanity_vnode_check_exec(struct ucred *cred, struct vnode *vp, struct label *label, struct label *execlabel) +vanity_vnode_check_exec(struct ucred *cred, struct vnode *vp, struct label *label, struct label *execlabel, struct componentname *cnp) { VANITY(vp); return (0); From owner-p4-projects@FreeBSD.ORG Thu Jan 25 15:41:22 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3882B16A403; Thu, 25 Jan 2007 15:41:22 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F297316A400 for ; Thu, 25 Jan 2007 15:41:21 +0000 (UTC) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E224B13C45A for ; Thu, 25 Jan 2007 15:41:21 +0000 (UTC) (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 l0PFfLfS059916 for ; Thu, 25 Jan 2007 15:41:21 GMT (envelope-from ryanb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0PFfLO2059901 for perforce@freebsd.org; Thu, 25 Jan 2007 15:41:21 GMT (envelope-from ryanb@FreeBSD.org) Date: Thu, 25 Jan 2007 15:41:21 GMT Message-Id: <200701251541.l0PFfLO2059901@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 113514 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2007 15:41:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=113514 Change 113514 by ryanb@ryanb_yuki on 2007/01/25 15:41:05 Initial integration into soundsystem branch. Affected files ... .. //depot/projects/soundsystem/src/sys/dev/sound/chip.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/driver.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/isa/ad1816.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/isa/ad1816.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/isa/ess.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/isa/gusc.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/isa/mss.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/isa/mss.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/isa/sb.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/isa/sb16.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/isa/sb8.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/isa/sbc.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/isa/sndbuf_dma.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/midi/midi.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/midi/midi.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/midi/midiq.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/midi/mpu401.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/midi/mpu401.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/midi/mpu_if.m#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/midi/mpufoi_if.m#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/midi/sequencer.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/midi/sequencer.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/midi/synth_if.m#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/als4000.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/als4000.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/atiixp.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/atiixp.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/au88x0.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/au88x0.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/aureal.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/aureal.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/cmi.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/cmireg.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/cs4281.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/cs4281.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/csa.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/csapcm.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/csareg.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/csavar.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/ds1-fw.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/ds1.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/ds1.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/emu10k1.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/emu10kx-midi.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/emu10kx-pcm.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/emu10kx.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/emu10kx.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/envy24.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/envy24.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/envy24ht.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/envy24ht.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/es137x.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/es137x.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/fm801.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/hda/hda_reg.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/hda/hdac.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/hda/hdac.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/hda/hdac_private.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/hda/hdac_reg.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/ich.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/ich.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/maestro.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/maestro3.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/maestro_reg.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/neomagic-coeff.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/neomagic.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/neomagic.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/solo.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/spicds.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/spicds.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/t4dwave.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/t4dwave.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/via8233.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/via8233.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/via82c686.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/via82c686.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/vibes.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pci/vibes.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/ac97.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/ac97.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/ac97_if.m#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/ac97_patch.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/ac97_patch.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/buffer.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/buffer.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/channel.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/channel.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/channel_if.m#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/dsp.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/dsp.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/fake.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/feeder.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/feeder.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/feeder_fmt.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/feeder_if.m#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/feeder_rate.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/feeder_volume.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/mixer.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/mixer.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/mixer_if.m#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/sndstat.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/sound.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/sound.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/vchan.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/pcm/vchan.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/sbus/apcdmareg.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/sbus/cs4231.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/sbus/cs4231.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/usb/uaudio.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/usb/uaudio.h#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/usb/uaudio_pcm.c#1 branch .. //depot/projects/soundsystem/src/sys/dev/sound/usb/uaudioreg.h#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/Makefile.inc#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/Makefile.inc#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/ad1816/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/als4000/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/atiixp/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/au88x0/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/audiocs/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/cmi/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/cs4281/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/csa/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/driver/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/ds1/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/emu10k1/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/emu10kx/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/envy24/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/envy24ht/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/es137x/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/ess/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/fm801/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/hda/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/ich/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/maestro/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/maestro3/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/mss/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/neomagic/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/sb16/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/sb8/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/sbc/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/solo/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/spicds/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/t4dwave/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/uaudio/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/via8233/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/via82c686/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/driver/vibes/Makefile#1 branch .. //depot/projects/soundsystem/src/sys/modules/sound/sound/Makefile#1 branch .. //depot/projects/soundsystem/src/usr.sbin/mixer/Makefile#1 branch .. //depot/projects/soundsystem/src/usr.sbin/mixer/mixer.8#1 branch .. //depot/projects/soundsystem/src/usr.sbin/mixer/mixer.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jan 25 17:26:30 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C078C16A405; Thu, 25 Jan 2007 17:26:30 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9DD8C16A403 for ; Thu, 25 Jan 2007 17:26:30 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 776BC13C455 for ; Thu, 25 Jan 2007 17:26:30 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0PHQUln088294 for ; Thu, 25 Jan 2007 17:26:30 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0PHQUmW088291 for perforce@freebsd.org; Thu, 25 Jan 2007 17:26:30 GMT (envelope-from zec@FreeBSD.org) Date: Thu, 25 Jan 2007 17:26:30 GMT Message-Id: <200701251726.l0PHQUmW088291@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 113516 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2007 17:26:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=113516 Change 113516 by zec@zec_tca51 on 2007/01/25 17:26:27 Don't complain about vnet stacking when moving interfaces from one vnet to another. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#14 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#14 (text+ko) ==== @@ -220,7 +220,7 @@ } ifp->if_bpf = NULL; - CURVNETB_SET(new_vnetb); + CURVNETB_SET_QUIET(new_vnetb); INIT_VNET_NET(new_vnetb); /* * Try to find an empty slot below if_index. If we fail, take From owner-p4-projects@FreeBSD.ORG Thu Jan 25 17:30:40 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9647D16A567; Thu, 25 Jan 2007 17:30:39 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E2E3816A412 for ; Thu, 25 Jan 2007 17:30:36 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0FD9213C457 for ; Thu, 25 Jan 2007 17:30:36 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0PHUZSo088560 for ; Thu, 25 Jan 2007 17:30:35 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0PHUZoJ088557 for perforce@freebsd.org; Thu, 25 Jan 2007 17:30:35 GMT (envelope-from zec@FreeBSD.org) Date: Thu, 25 Jan 2007 17:30:35 GMT Message-Id: <200701251730.l0PHUZoJ088557@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 113517 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2007 17:30:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=113517 Change 113517 by zec@zec_tca51 on 2007/01/25 17:30:26 Let arptimer() run in all vnets, not only in the default one. While there, virtualize a few arp-related sysctls. Affected files ... .. //depot/projects/vimage/src/sys/netinet/if_ether.c#7 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#8 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#13 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/if_ether.c#7 (text+ko) ==== @@ -83,13 +83,15 @@ SYSCTL_NODE(_net_link_ether, PF_INET, inet, CTLFLAG_RW, 0, ""); /* timer values */ -static int arpt_prune = (5*60*1); /* walk list every 5 minutes */ -static int arpt_keep = (20*60); /* once resolved, good for 20 more minutes */ +#ifndef VIMAGE +static int arpt_prune; +static int arpt_keep; +#endif -SYSCTL_INT(_net_link_ether_inet, OID_AUTO, prune_intvl, CTLFLAG_RW, - &arpt_prune, 0, "ARP table prune interval in seconds"); -SYSCTL_INT(_net_link_ether_inet, OID_AUTO, max_age, CTLFLAG_RW, - &arpt_keep, 0, "ARP entry lifetime in seconds"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_link_ether_inet, OID_AUTO, prune_intvl, + CTLFLAG_RW, arpt_prune, 0, "ARP table prune interval in seconds"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_link_ether_inet, OID_AUTO, max_age, + CTLFLAG_RW, arpt_keep, 0, "ARP entry lifetime in seconds"); #define rt_expire rt_rmx.rmx_expire @@ -101,26 +103,28 @@ u_short la_asked; /* # requests sent */ }; +static struct ifqueue arpintrq; + #ifndef VIMAGE static LIST_HEAD(, llinfo_arp) llinfo_arp; +static int arp_maxtries; +static int useloopback; +static int arp_proxyall; +static struct callout arp_callout; #endif -static struct ifqueue arpintrq; -static int arp_allocated; - -static int arp_maxtries = 5; -static int useloopback = 1; /* use loopback interface for local traffic */ -static int arp_proxyall = 0; -static struct callout arp_callout; - -SYSCTL_INT(_net_link_ether_inet, OID_AUTO, maxtries, CTLFLAG_RW, - &arp_maxtries, 0, "ARP resolution attempts before returning error"); -SYSCTL_INT(_net_link_ether_inet, OID_AUTO, useloopback, CTLFLAG_RW, - &useloopback, 0, "Use the loopback interface for local traffic"); -SYSCTL_INT(_net_link_ether_inet, OID_AUTO, proxyall, CTLFLAG_RW, - &arp_proxyall, 0, "Enable proxy ARP for all suitable requests"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_link_ether_inet, OID_AUTO, maxtries, + CTLFLAG_RW, arp_maxtries, 0, + "ARP resolution attempts before returning error"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_link_ether_inet, OID_AUTO, useloopback, + CTLFLAG_RW, useloopback, 0, + "Use the loopback interface for local traffic"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_link_ether_inet, OID_AUTO, proxyall, + CTLFLAG_RW, arp_proxyall, 0, + "Enable proxy ARP for all suitable requests"); static void arp_init(void); +static int arp_iattach(void); static void arp_rtrequest(int, struct rtentry *, struct rt_addrinfo *); static void arprequest(struct ifnet *, struct in_addr *, struct in_addr *, u_char *); @@ -132,6 +136,17 @@ static void in_arpinput(struct mbuf *); #endif +#ifdef VIMAGE +static struct vnet_modinfo vnet_arp_modinfo = { + .id = VNET_MOD_ARP, + .flags = VNET_MFLAG_ORDER_2ND, + .name = "arp", + .symmap = NULL, + .i_attach = arp_iattach, + .i_detach = NULL, +}; +#endif + /* * Timeout routine. Age arp_tab entries periodically. */ @@ -173,7 +188,7 @@ RADIX_NODE_HEAD_UNLOCK(V_rt_tables[AF_INET]); CURVNETB_RESTORE(); - callout_reset(&arp_callout, arpt_prune * hz, arptimer, arg); + callout_reset(&V_arp_callout, V_arpt_prune * hz, arptimer, arg); } /* @@ -253,7 +268,6 @@ log(LOG_DEBUG, "%s: malloc failed\n", __func__); break; } - arp_allocated++; /* * We are storing a route entry outside of radix tree. So, * it can be found and accessed by other means than radix @@ -308,7 +322,7 @@ rt->rt_expire = 0; bcopy(IF_LLADDR(rt->rt_ifp), LLADDR(SDL(gate)), SDL(gate)->sdl_alen = rt->rt_ifp->if_addrlen); - if (useloopback) { + if (V_useloopback) { rt->rt_ifp = V_loif; rt->rt_rmx.rmx_mtu = V_loif->if_mtu; } @@ -400,6 +414,7 @@ arpresolve(struct ifnet *ifp, struct rtentry *rt0, struct mbuf *m, struct sockaddr *dst, u_char *desten) { + INIT_VNET_INET(ifp->if_vnetb); struct llinfo_arp *la = NULL; struct rtentry *rt = NULL; struct sockaddr_dl *sdl; @@ -504,7 +519,7 @@ * if we have already sent arp_maxtries ARP requests. Retransmit the * ARP request, but not faster than one request per second. */ - if (la->la_asked < arp_maxtries) + if (la->la_asked < V_arp_maxtries) error = EWOULDBLOCK; /* First request. */ else error = (rt == rt0) ? EHOSTDOWN : EHOSTUNREACH; @@ -809,9 +824,9 @@ th->rcf = trld->trld_rcf; } if (rt->rt_expire) - rt->rt_expire = time_uptime + arpt_keep; + rt->rt_expire = time_uptime + V_arpt_keep; la->la_asked = 0; - la->la_preempt = arp_maxtries; + la->la_preempt = V_arp_maxtries; hold = la->la_hold; la->la_hold = NULL; RT_UNLOCK(rt); @@ -830,7 +845,7 @@ if (rt == NULL) { struct sockaddr_in sin; - if (!arp_proxyall) + if (!V_arp_proxyall) goto drop; bzero(&sin, sizeof sin); @@ -993,18 +1008,35 @@ ifa->ifa_flags |= RTF_CLONING; } +static int +arp_iattach(void) +{ + INIT_VNET_INET(curvnetb); + + V_arpt_prune = (5*60*1); /* walk list every 5 minutes */ + V_arpt_keep = (20*60); /* once resolved, good for 20 more minutes */ + V_arp_maxtries = 5; + V_useloopback = 1; /* use loopback interface for local traffic */ + V_arp_proxyall = 0; + + LIST_INIT(&V_llinfo_arp); + callout_init(&V_arp_callout, CALLOUT_MPSAFE); + callout_reset(&V_arp_callout, hz, arptimer, curvnetb); + + return 0; +} + static void arp_init(void) { - INIT_VNET_INET(curvnetb); /* XXX should panic here! */ -printf("arp_init\n"); - +#ifdef VIMAGE + vnet_mod_register(&vnet_arp_modinfo); +#else + arp_iattach(); +#endif arpintrq.ifq_maxlen = 50; mtx_init(&arpintrq.ifq_mtx, "arp_inq", NULL, MTX_DEF); - LIST_INIT(&V_llinfo_arp); /* XXX */ - callout_init(&arp_callout, CALLOUT_MPSAFE); netisr_register(NETISR_ARP, arpintr, &arpintrq, NETISR_MPSAFE); - callout_reset(&arp_callout, hz, arptimer, curvnetb); } SYSINIT(arp, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, arp_init, 0); ==== //depot/projects/vimage/src/sys/netinet/vinet.h#8 (text+ko) ==== @@ -62,6 +62,12 @@ struct in_multihead _in_multihead; LIST_HEAD(, llinfo_arp) _llinfo_arp; + struct callout _arp_callout; + int _arpt_prune; + int _arpt_keep; + int _arp_maxtries; + int _useloopback; + int _arp_proxyall; int _ipforwarding; @@ -118,6 +124,12 @@ #define V_in_multihead VNET_INET(in_multihead) #define V_llinfo_arp VNET_INET(llinfo_arp) +#define V_arp_callout VNET_INET(arp_callout) +#define V_arpt_prune VNET_INET(arpt_prune) +#define V_arpt_keep VNET_INET(arpt_keep) +#define V_arp_maxtries VNET_INET(arp_maxtries) +#define V_useloopback VNET_INET(useloopback) +#define V_arp_proxyall VNET_INET(arp_proxyall) #define V_ipforwarding VNET_INET(ipforwarding) ==== //depot/projects/vimage/src/sys/sys/vimage.h#13 (text+ko) ==== @@ -68,6 +68,7 @@ #define VNET_MOD_IPX 4 #define VNET_MOD_ATALK 5 #define VNET_MOD_IPFW 8 +#define VNET_MOD_ARP 29 #define VNET_MOD_RTABLE 30 #define VNET_MOD_LOIF 31 #define VNET_MOD_DYNAMIC_START 32 From owner-p4-projects@FreeBSD.ORG Thu Jan 25 18:02:17 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B3FA16A406; Thu, 25 Jan 2007 18:02:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4CD7316A404 for ; Thu, 25 Jan 2007 18:02:17 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 25D2A13C44B for ; Thu, 25 Jan 2007 18:02:17 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0PI2HZ4094412 for ; Thu, 25 Jan 2007 18:02:17 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0PI2Gct094409 for perforce@freebsd.org; Thu, 25 Jan 2007 18:02:17 GMT (envelope-from mjacob@freebsd.org) Date: Thu, 25 Jan 2007 18:02:17 GMT Message-Id: <200701251802.l0PI2Gct094409@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 113520 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2007 18:02:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=113520 Change 113520 by mjacob@mjexp on 2007/01/25 18:01:29 Whoops- #ifdef problem caused uninitialized transport. Affected files ... .. //depot/projects/mjexp/sys/dev/mpt/mpt_cam.c#10 edit Differences ... ==== //depot/projects/mjexp/sys/dev/mpt/mpt_cam.c#10 (text+ko) ==== @@ -3264,7 +3264,7 @@ /* * The base speed is the speed of the underlying connection. */ -#ifdef CAM_NEW_TRAN +#ifdef CAM_NEW_TRAN_CODE cpi->protocol = PROTO_SCSI; if (mpt->is_fc) { cpi->hba_misc = PIM_NOBUSRESET; From owner-p4-projects@FreeBSD.ORG Thu Jan 25 18:09:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE49216A403; Thu, 25 Jan 2007 18:09:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C354F16A401 for ; Thu, 25 Jan 2007 18:09:27 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B2E6F13C474 for ; Thu, 25 Jan 2007 18:09:27 +0000 (UTC) (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 l0PI9R9a096653 for ; Thu, 25 Jan 2007 18:09:27 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0PI9RrZ096650 for perforce@freebsd.org; Thu, 25 Jan 2007 18:09:27 GMT (envelope-from millert@freebsd.org) Date: Thu, 25 Jan 2007 18:09:27 GMT Message-Id: <200701251809.l0PI9RrZ096650@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 113523 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2007 18:09:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=113523 Change 113523 by millert@millert_macbook on 2007/01/25 18:08:31 Update to latest selinux kernel components from the selinux-2.6 git repo. The only real change that affects SEDarwin is better security class validation (sanity checking). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#22 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.h#11 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc_ss.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/context.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/ebitmap.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/ebitmap.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/hashtab.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/hashtab.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/mls.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/mls.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/policydb.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/security.h#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/services.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/symtab.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#22 (text+ko) ==== @@ -52,13 +52,7 @@ #include #include -#ifndef __APPLE__ -static const struct av_perm_to_string -{ - u16 tclass; - u32 value; - const char *name; -} av_perm_to_string[] = { +static const struct av_perm_to_string av_perm_to_string[] = { #define S_(c, v, s) { c, v, s }, #include #undef S_ @@ -78,17 +72,20 @@ #undef TE_ #undef S_ -static const struct av_inherit -{ - u16 tclass; - const char **common_pts; - u32 common_base; -} av_inherit[] = { +static const struct av_inherit av_inherit[] = { #define S_(c, i, b) { c, common_##i##_perm_to_string, b }, #include #undef S_ }; -#endif /* __APPLE__ */ + +const struct selinux_class_perm selinux_class_perm = { + av_perm_to_string, + ARRAY_SIZE(av_perm_to_string), + class_to_string, + ARRAY_SIZE(class_to_string), + av_inherit, + ARRAY_SIZE(av_inherit) +}; #define AVC_CACHE_SLOTS 512 #define AVC_CACHE_MAXNODES 558 @@ -557,7 +554,7 @@ audit_log_format(ab, " %s=%d", name2, ntohs(port)); } -static inline void avc_print_ipv4_addr(struct audit_buffer *ab, u32 addr, +static inline void avc_print_ipv4_addr(struct audit_buffer *ab, __be32 addr, __be16 port, const char *name1, const char *name2) { ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.h#11 (text+ko) ==== @@ -58,12 +58,12 @@ u32 netif_unit; struct xsocket *xso; u16 family; - u16 dport; - u16 sport; + __be16 dport; + __be16 sport; union { struct { - u32 daddr; - u32 saddr; + __be32 daddr; + __be32 saddr; } v4; struct { struct in6_addr daddr; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc_ss.h#2 (text+ko) ==== @@ -11,5 +11,29 @@ int avc_ss_reset(u32 seqno); +struct av_perm_to_string +{ + u16 tclass; + u32 value; + const char *name; +}; + +struct av_inherit +{ + u16 tclass; + const char **common_pts; + u32 common_base; +}; + +struct selinux_class_perm +{ + const struct av_perm_to_string *av_perm_to_string; + u32 av_pts_len; + const char **class_to_string; + u32 cts_len; + const struct av_inherit *av_inherit; + u32 av_inherit_len; +}; + #endif /* _SELINUX_AVC_SS_H_ */ ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/context.h#3 (text+ko) ==== @@ -55,6 +55,29 @@ return rc; } +/* + * Sets both levels in the MLS range of 'dst' to the low level of 'src'. + */ +static inline int mls_context_cpy_low(struct context *dst, struct context *src) +{ + int rc; + + if (!selinux_mls_enabled) + return 0; + + dst->range.level[0].sens = src->range.level[0].sens; + rc = ebitmap_cpy(&dst->range.level[0].cat, &src->range.level[0].cat); + if (rc) + goto out; + + dst->range.level[1].sens = src->range.level[0].sens; + rc = ebitmap_cpy(&dst->range.level[1].cat, &src->range.level[0].cat); + if (rc) + ebitmap_destroy(&dst->range.level[0].cat); +out: + return rc; +} + static inline int mls_context_cmp(struct context *c1, struct context *c2) { if (!selinux_mls_enabled) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/ebitmap.c#3 (text+ko) ==== @@ -6,7 +6,7 @@ /* * Updated: Hewlett-Packard * - * Added ebitmap_export() and ebitmap_import() + * Added support to import/export the NetLabel category bitmap * * (c) Copyright Hewlett-Packard Development Company, L.P., 2006 */ @@ -64,141 +64,120 @@ return 0; } +#ifdef CONFIG_NETLABEL /** - * ebitmap_export - Export an ebitmap to a unsigned char bitmap string - * @src: the ebitmap to export - * @dst: the resulting bitmap string - * @dst_len: length of dst in bytes + * ebitmap_netlbl_export - Export an ebitmap into a NetLabel category bitmap + * @ebmap: the ebitmap to export + * @catmap: the NetLabel category bitmap * * Description: - * Allocate a buffer at least src->highbit bits long and export the extensible - * bitmap into the buffer. The bitmap string will be in little endian format, - * i.e. LSB first. The value returned in dst_len may not the true size of the - * buffer as the length of the buffer is rounded up to a multiple of MAPTYPE. - * The caller must free the buffer when finished. Returns zero on success, - * negative values on failure. + * Export a SELinux extensibile bitmap into a NetLabel category bitmap. + * Returns zero on success, negative values on error. * */ -int ebitmap_export(const struct ebitmap *src, - unsigned char **dst, - size_t *dst_len) +int ebitmap_netlbl_export(struct ebitmap *ebmap, + struct netlbl_lsm_secattr_catmap **catmap) { - size_t bitmap_len; - unsigned char *bitmap; - struct ebitmap_node *iter_node; - MAPTYPE node_val; - size_t bitmap_byte; - unsigned char bitmask; + struct ebitmap_node *e_iter = ebmap->node; + struct netlbl_lsm_secattr_catmap *c_iter; + u32 cmap_idx; + + /* This function is a much simpler because SELinux's MAPTYPE happens + * to be the same as NetLabel's NETLBL_CATMAP_MAPTYPE, if MAPTYPE is + * changed from a u64 this function will most likely need to be changed + * as well. It's not ideal but I think the tradeoff in terms of + * neatness and speed is worth it. */ - if (src->highbit == 0) { - *dst = NULL; - *dst_len = 0; + if (e_iter == NULL) { + *catmap = NULL; return 0; } - bitmap_len = src->highbit / 8; - if (src->highbit % 7) - bitmap_len += 1; + c_iter = netlbl_secattr_catmap_alloc(GFP_ATOMIC); + if (c_iter == NULL) + return -ENOMEM; + *catmap = c_iter; + c_iter->startbit = e_iter->startbit & ~(NETLBL_CATMAP_SIZE - 1); - bitmap = kzalloc((bitmap_len & ~(sizeof(MAPTYPE) - 1)) + - sizeof(MAPTYPE), - GFP_ATOMIC); - if (bitmap == NULL) - return ENOMEM; + while (e_iter != NULL) { + if (e_iter->startbit >= + (c_iter->startbit + NETLBL_CATMAP_SIZE)) { + c_iter->next = netlbl_secattr_catmap_alloc(GFP_ATOMIC); + if (c_iter->next == NULL) + goto netlbl_export_failure; + c_iter = c_iter->next; + c_iter->startbit = e_iter->startbit & + ~(NETLBL_CATMAP_SIZE - 1); + } + cmap_idx = (e_iter->startbit - c_iter->startbit) / + NETLBL_CATMAP_MAPSIZE; + c_iter->bitmap[cmap_idx] = e_iter->map; + e_iter = e_iter->next; + } - iter_node = src->node; - do { - bitmap_byte = iter_node->startbit / 8; - bitmask = 0x80; - node_val = iter_node->map; - do { - if (bitmask == 0) { - bitmap_byte++; - bitmask = 0x80; - } - if (node_val & (MAPTYPE)0x01) - bitmap[bitmap_byte] |= bitmask; - node_val >>= 1; - bitmask >>= 1; - } while (node_val > 0); - iter_node = iter_node->next; - } while (iter_node); + return 0; - *dst = bitmap; - *dst_len = bitmap_len; - return 0; +netlbl_export_failure: + netlbl_secattr_catmap_free(*catmap); + return -ENOMEM; } /** - * ebitmap_import - Import an unsigned char bitmap string into an ebitmap - * @src: the bitmap string - * @src_len: the bitmap length in bytes - * @dst: the empty ebitmap + * ebitmap_netlbl_import - Import a NetLabel category bitmap into an ebitmap + * @ebmap: the ebitmap to export + * @catmap: the NetLabel category bitmap * * Description: - * This function takes a little endian bitmap string in src and imports it into - * the ebitmap pointed to by dst. Returns zero on success, negative values on - * failure. + * Import a NetLabel category bitmap into a SELinux extensibile bitmap. + * Returns zero on success, negative values on error. * */ -int ebitmap_import(const unsigned char *src, - size_t src_len, - struct ebitmap *dst) +int ebitmap_netlbl_import(struct ebitmap *ebmap, + struct netlbl_lsm_secattr_catmap *catmap) { - size_t src_off = 0; - size_t node_limit; - struct ebitmap_node *node_new; - struct ebitmap_node *node_last = NULL; - u32 i_byte; - u32 i_bit; - unsigned char src_byte; + struct ebitmap_node *e_iter = NULL; + struct ebitmap_node *emap_prev = NULL; + struct netlbl_lsm_secattr_catmap *c_iter = catmap; + u32 c_idx; + + /* This function is a much simpler because SELinux's MAPTYPE happens + * to be the same as NetLabel's NETLBL_CATMAP_MAPTYPE, if MAPTYPE is + * changed from a u64 this function will most likely need to be changed + * as well. It's not ideal but I think the tradeoff in terms of + * neatness and speed is worth it. */ - while (src_off < src_len) { - if (src_len - src_off >= sizeof(MAPTYPE)) { - if (*(MAPTYPE *)&src[src_off] == 0) { - src_off += sizeof(MAPTYPE); + do { + for (c_idx = 0; c_idx < NETLBL_CATMAP_MAPCNT; c_idx++) { + if (c_iter->bitmap[c_idx] == 0) continue; - } - node_limit = sizeof(MAPTYPE); - } else { - for (src_byte = 0, i_byte = src_off; - i_byte < src_len && src_byte == 0; - i_byte++) - src_byte |= src[i_byte]; - if (src_byte == 0) - break; - node_limit = src_len - src_off; - } + + e_iter = kzalloc(sizeof(*e_iter), GFP_ATOMIC); + if (e_iter == NULL) + goto netlbl_import_failure; + if (emap_prev == NULL) + ebmap->node = e_iter; + else + emap_prev->next = e_iter; + emap_prev = e_iter; - node_new = kzalloc(sizeof(*node_new), GFP_ATOMIC); - if (unlikely(node_new == NULL)) { - ebitmap_destroy(dst); - return ENOMEM; + e_iter->startbit = c_iter->startbit + + NETLBL_CATMAP_MAPSIZE * c_idx; + e_iter->map = c_iter->bitmap[c_idx]; } - node_new->startbit = src_off * 8; - for (i_byte = 0; i_byte < node_limit; i_byte++) { - src_byte = src[src_off++]; - for (i_bit = i_byte * 8; src_byte != 0; i_bit++) { - if (src_byte & 0x80) - node_new->map |= MAPBIT << i_bit; - src_byte <<= 1; - } - } - - if (node_last != NULL) - node_last->next = node_new; - else - dst->node = node_new; - node_last = node_new; - } - - if (likely(node_last != NULL)) - dst->highbit = node_last->startbit + MAPSIZE; + c_iter = c_iter->next; + } while (c_iter != NULL); + if (e_iter != NULL) + ebmap->highbit = e_iter->startbit + MAPSIZE; else - ebitmap_init(dst); + ebitmap_destroy(ebmap); return 0; + +netlbl_import_failure: + ebitmap_destroy(ebmap); + return -ENOMEM; } +#endif /* CONFIG_NETLABEL */ int ebitmap_contains(struct ebitmap *e1, struct ebitmap *e2) { ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/ebitmap.h#3 (text+ko) ==== @@ -73,16 +73,28 @@ int ebitmap_cmp(struct ebitmap *e1, struct ebitmap *e2); int ebitmap_cpy(struct ebitmap *dst, struct ebitmap *src); -int ebitmap_export(const struct ebitmap *src, - unsigned char **dst, - size_t *dst_len); -int ebitmap_import(const unsigned char *src, - size_t src_len, - struct ebitmap *dst); int ebitmap_contains(struct ebitmap *e1, struct ebitmap *e2); int ebitmap_get_bit(struct ebitmap *e, unsigned long bit); int ebitmap_set_bit(struct ebitmap *e, unsigned long bit, int value); void ebitmap_destroy(struct ebitmap *e); int ebitmap_read(struct ebitmap *e, void *fp); +#ifdef CONFIG_NETLABEL +int ebitmap_netlbl_export(struct ebitmap *ebmap, + struct netlbl_lsm_secattr_catmap **catmap); +int ebitmap_netlbl_import(struct ebitmap *ebmap, + struct netlbl_lsm_secattr_catmap *catmap); +#else +static inline int ebitmap_netlbl_export(struct ebitmap *ebmap, + struct netlbl_lsm_secattr_catmap **catmap) +{ + return -ENOMEM; +} +static inline int ebitmap_netlbl_import(struct ebitmap *ebmap, + struct netlbl_lsm_secattr_catmap *catmap) +{ + return -ENOMEM; +} +#endif + #endif /* _SS_EBITMAP_H_ */ ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/hashtab.c#2 (text+ko) ==== @@ -9,8 +9,8 @@ #include #include -struct hashtab *hashtab_create(u32 (*hash_value)(struct hashtab *h, void *key), - int (*keycmp)(struct hashtab *h, void *key1, void *key2), +struct hashtab *hashtab_create(u32 (*hash_value)(struct hashtab *h, const void *key), + int (*keycmp)(struct hashtab *h, const void *key1, const void *key2), u32 size) { struct hashtab *p; @@ -72,7 +72,7 @@ return 0; } -void *hashtab_search(struct hashtab *h, void *key) +void *hashtab_search(struct hashtab *h, const void *key) { u32 hvalue; struct hashtab_node *cur; ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/hashtab.h#2 (text+ko) ==== @@ -24,9 +24,9 @@ struct hashtab_node **htable; /* hash table */ u32 size; /* number of slots in hash table */ u32 nel; /* number of elements in hash table */ - u32 (*hash_value)(struct hashtab *h, void *key); + u32 (*hash_value)(struct hashtab *h, const void *key); /* hash function */ - int (*keycmp)(struct hashtab *h, void *key1, void *key2); + int (*keycmp)(struct hashtab *h, const void *key1, const void *key2); /* key comparison function */ }; @@ -41,8 +41,8 @@ * Returns NULL if insufficent space is available or * the new hash table otherwise. */ -struct hashtab *hashtab_create(u32 (*hash_value)(struct hashtab *h, void *key), - int (*keycmp)(struct hashtab *h, void *key1, void *key2), +struct hashtab *hashtab_create(u32 (*hash_value)(struct hashtab *h, const void *key), + int (*keycmp)(struct hashtab *h, const void *key1, const void *key2), u32 size); /* @@ -61,7 +61,7 @@ * Returns NULL if no entry has the specified key or * the datum of the entry otherwise. */ -void *hashtab_search(struct hashtab *h, void *k); +void *hashtab_search(struct hashtab *h, const void *k); /* * Destroys the specified hash table. ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/mls.c#3 (text+ko) ==== @@ -13,7 +13,7 @@ /* * Updated: Hewlett-Packard * - * Added support to import/export the MLS label + * Added support to import/export the MLS label from NetLabel * * (c) Copyright Hewlett-Packard Development Company, L.P., 2006 */ @@ -270,7 +270,7 @@ if (!defcon) goto out; - rc = mls_copy_context(context, defcon); + rc = mls_context_cpy(context, defcon); goto out; } @@ -401,26 +401,6 @@ } /* - * Copies the effective MLS range from `src' into `dst'. - */ -static inline int mls_scopy_context(struct context *dst, - struct context *src) -{ - int l, rc = 0; - - /* Copy the MLS range from the source context */ - for (l = 0; l < 2; l++) { - dst->range.level[l].sens = src->range.level[0].sens; - rc = ebitmap_cpy(&dst->range.level[l].cat, - &src->range.level[0].cat); - if (rc) - break; - } - - return rc; -} - -/* * Copies the MLS range `range' into `context'. */ static inline int mls_range_set(struct context *context, @@ -553,19 +533,19 @@ case AVTAB_CHANGE: if (tclass == SECCLASS_PROCESS) /* Use the process MLS attributes. */ - return mls_copy_context(newcontext, scontext); + return mls_context_cpy(newcontext, scontext); else /* Use the process effective MLS attributes. */ - return mls_scopy_context(newcontext, scontext); + return mls_context_cpy_low(newcontext, scontext); case AVTAB_MEMBER: /* Only polyinstantiate the MLS attributes if the type is being polyinstantiated */ if (newcontext->type != tcontext->type) { /* Use the process effective MLS attributes. */ - return mls_scopy_context(newcontext, scontext); + return mls_context_cpy_low(newcontext, scontext); } else { /* Use the related object MLS attributes. */ - return mls_copy_context(newcontext, tcontext); + return mls_context_cpy(newcontext, tcontext); } default: return EINVAL; @@ -573,163 +553,108 @@ return EINVAL; } +#ifdef CONFIG_NETLABEL /** - * mls_export_lvl - Export the MLS sensitivity levels + * mls_export_netlbl_lvl - Export the MLS sensitivity levels to NetLabel * @context: the security context - * @low: the low sensitivity level - * @high: the high sensitivity level + * @secattr: the NetLabel security attributes * * Description: - * Given the security context copy the low MLS sensitivity level into lvl_low - * and the high sensitivity level in lvl_high. The MLS levels are only - * exported if the pointers are not NULL, if they are NULL then that level is - * not exported. + * Given the security context copy the low MLS sensitivity level into the + * NetLabel MLS sensitivity level field. * */ -void mls_export_lvl(const struct context *context, u32 *low, u32 *high) +void mls_export_netlbl_lvl(struct context *context, + struct netlbl_lsm_secattr *secattr) { if (!selinux_mls_enabled) return; - if (low != NULL) - *low = context->range.level[0].sens - 1; - if (high != NULL) - *high = context->range.level[1].sens - 1; + secattr->mls_lvl = context->range.level[0].sens - 1; + secattr->flags |= NETLBL_SECATTR_MLS_LVL; } /** - * mls_import_lvl - Import the MLS sensitivity levels + * mls_import_netlbl_lvl - Import the NetLabel MLS sensitivity levels * @context: the security context - * @low: the low sensitivity level - * @high: the high sensitivity level + * @secattr: the NetLabel security attributes * * Description: - * Given the security context and the two sensitivty levels, set the MLS levels - * in the context according the two given as parameters. Returns zero on - * success, negative values on failure. + * Given the security context and the NetLabel security attributes, copy the + * NetLabel MLS sensitivity level into the context. * */ -void mls_import_lvl(struct context *context, u32 low, u32 high) +void mls_import_netlbl_lvl(struct context *context, + struct netlbl_lsm_secattr *secattr) { if (!selinux_mls_enabled) return; - context->range.level[0].sens = low + 1; - context->range.level[1].sens = high + 1; + context->range.level[0].sens = secattr->mls_lvl + 1; + context->range.level[1].sens = context->range.level[0].sens; } /** - * mls_export_cat - Export the MLS categories + * mls_export_netlbl_cat - Export the MLS categories to NetLabel * @context: the security context - * @low: the low category - * @low_len: length of the cat_low bitmap in bytes - * @high: the high category - * @high_len: length of the cat_high bitmap in bytes + * @secattr: the NetLabel security attributes * * Description: - * Given the security context export the low MLS category bitmap into cat_low - * and the high category bitmap into cat_high. The MLS categories are only - * exported if the pointers are not NULL, if they are NULL then that level is - * not exported. The caller is responsibile for freeing the memory when - * finished. Returns zero on success, negative values on failure. + * Given the security context copy the low MLS categories into the NetLabel + * MLS category field. Returns zero on success, negative values on failure. * */ -int mls_export_cat(const struct context *context, - unsigned char **low, - size_t *low_len, - unsigned char **high, - size_t *high_len) +int mls_export_netlbl_cat(struct context *context, + struct netlbl_lsm_secattr *secattr) { - int rc = EPERM; + int rc; - if (!selinux_mls_enabled) { - *low = NULL; - *low_len = 0; - *high = NULL; - *high_len = 0; + if (!selinux_mls_enabled) return 0; - } - if (low != NULL) { - rc = ebitmap_export(&context->range.level[0].cat, - low, - low_len); - if (rc != 0) - goto export_cat_failure; - } - if (high != NULL) { - rc = ebitmap_export(&context->range.level[1].cat, - high, - high_len); - if (rc != 0) - goto export_cat_failure; - } - - return 0; + rc = ebitmap_netlbl_export(&context->range.level[0].cat, + &secattr->mls_cat); + if (rc == 0 && secattr->mls_cat != NULL) + secattr->flags |= NETLBL_SECATTR_MLS_CAT; -export_cat_failure: - if (low != NULL) { - kfree(*low); - *low = NULL; - *low_len = 0; - } - if (high != NULL) { - kfree(*high); - *high = NULL; - *high_len = 0; - } return rc; } /** - * mls_import_cat - Import the MLS categories + * mls_import_netlbl_cat - Import the MLS categories from NetLabel * @context: the security context - * @low: the low category - * @low_len: length of the cat_low bitmap in bytes - * @high: the high category - * @high_len: length of the cat_high bitmap in bytes + * @secattr: the NetLabel security attributes * * Description: - * Given the security context and the two category bitmap strings import the - * categories into the security context. The MLS categories are only imported - * if the pointers are not NULL, if they are NULL they are skipped. Returns - * zero on success, negative values on failure. + * Copy the NetLabel security attributes into the SELinux context; since the + * NetLabel security attribute only contains a single MLS category use it for + * both the low and high categories of the context. Returns zero on success, + * negative values on failure. * */ -int mls_import_cat(struct context *context, - const unsigned char *low, - size_t low_len, - const unsigned char *high, - size_t high_len) +int mls_import_netlbl_cat(struct context *context, + struct netlbl_lsm_secattr *secattr) { - int rc = EPERM; + int rc; if (!selinux_mls_enabled) return 0; - if (low != NULL) { - rc = ebitmap_import(low, - low_len, - &context->range.level[0].cat); - if (rc != 0) - goto import_cat_failure; - } - if (high != NULL) { - if (high == low) - rc = ebitmap_cpy(&context->range.level[1].cat, - &context->range.level[0].cat); - else - rc = ebitmap_import(high, - high_len, - &context->range.level[1].cat); - if (rc != 0) - goto import_cat_failure; - } + rc = ebitmap_netlbl_import(&context->range.level[0].cat, + secattr->mls_cat); + if (rc != 0) + goto import_netlbl_cat_failure; + + rc = ebitmap_cpy(&context->range.level[1].cat, + &context->range.level[0].cat); + if (rc != 0) + goto import_netlbl_cat_failure; return 0; -import_cat_failure: +import_netlbl_cat_failure: ebitmap_destroy(&context->range.level[0].cat); ebitmap_destroy(&context->range.level[1].cat); return rc; } +#endif /* CONFIG_NETLABEL */ ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/mls.h#3 (text+ko) ==== @@ -13,7 +13,7 @@ /* * Updated: Hewlett-Packard * - * Added support to import/export the MLS label + * Added support to import/export the MLS label from NetLabel * * (c) Copyright Hewlett-Packard Development Company, L.P., 2006 */ @@ -24,26 +24,6 @@ #include #include -/* - * Copies the MLS range from `src' into `dst'. - */ -static inline int mls_copy_context(struct context *dst, - struct context *src) -{ - int l, rc = 0; - - /* Copy the MLS range from the source context */ - for (l = 0; l < 2; l++) { - dst->range.level[l].sens = src->range.level[l].sens; - rc = ebitmap_cpy(&dst->range.level[l].cat, - &src->range.level[l].cat); - if (rc) - break; - } - - return rc; -} - int mls_compute_context_len(struct context *context); void mls_sid_to_context(struct context *context, char **scontext); int mls_context_isvalid(struct policydb *p, struct context *c); @@ -69,19 +49,37 @@ int mls_setup_user_range(struct context *fromcon, struct user_datum *user, struct context *usercon); -void mls_export_lvl(const struct context *context, u32 *low, u32 *high); -void mls_import_lvl(struct context *context, u32 low, u32 high); - -int mls_export_cat(const struct context *context, - unsigned char **low, - size_t *low_len, - unsigned char **high, - size_t *high_len); -int mls_import_cat(struct context *context, - const unsigned char *low, - size_t low_len, - const unsigned char *high, - size_t high_len); +#ifdef CONFIG_NETLABEL +void mls_export_netlbl_lvl(struct context *context, + struct netlbl_lsm_secattr *secattr); +void mls_import_netlbl_lvl(struct context *context, + struct netlbl_lsm_secattr *secattr); +int mls_export_netlbl_cat(struct context *context, + struct netlbl_lsm_secattr *secattr); +int mls_import_netlbl_cat(struct context *context, + struct netlbl_lsm_secattr *secattr); +#else +static inline void mls_export_netlbl_lvl(struct context *context, + struct netlbl_lsm_secattr *secattr) +{ + return; +} +static inline void mls_import_netlbl_lvl(struct context *context, + struct netlbl_lsm_secattr *secattr) +{ + return; +} +static inline int mls_export_netlbl_cat(struct context *context, + struct netlbl_lsm_secattr *secattr) +{ + return -ENOMEM; +} +static inline int mls_import_netlbl_cat(struct context *context, + struct netlbl_lsm_secattr *secattr) +{ + return -ENOMEM; +} +#endif #endif /* _SS_MLS_H */ ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/policydb.c#3 (text+ko) ==== @@ -464,7 +464,7 @@ return 0; } -static int class_destroy(void *key, void *datum, void *p) +static int cls_destroy(void *key, void *datum, void *p) { struct class_datum *cladatum; struct constraint_node *constraint, *ctemp; @@ -562,7 +562,7 @@ static int (*destroy_f[SYM_NUM]) (void *key, void *datum, void *datap) = { common_destroy, - class_destroy, + cls_destroy, role_destroy, type_destroy, user_destroy, @@ -1120,7 +1120,7 @@ out: return rc; bad: - class_destroy(key, cladatum, NULL); + cls_destroy(key, cladatum, NULL); goto out; } ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/security.h#5 (text+ko) ==== @@ -32,6 +32,8 @@ #define POLICYDB_VERSION_MAX POLICYDB_VERSION_RANGETRANS #endif +struct sk_buff; + extern int selinux_enabled; extern int selinux_mls_enabled; @@ -80,6 +82,8 @@ int security_node_sid(u16 domain, void *addr, u32 addrlen, u32 *out_sid); +void security_skb_extlbl_sid(struct sk_buff *skb, u32 base_sid, u32 *sid); + int security_validate_transition(u32 oldsid, u32 newsid, u32 tasksid, u16 tclass); ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/services.c#6 (text+ko) ==== @@ -15,7 +15,11 @@ * * Updated: Hewlett-Packard * - * Added support for NetLabel + * Added support for NetLabel + * + * Updated: Chad Sellers + * + * Added validation of kernel classes and permissions * * This software was enhanced by SPARTA ISSO under SPAWAR contract * N66001-04-C-6019 ("SEFOS"). @@ -23,7 +27,7 @@ * Copyright (c) 2005-2006 SPARTA, Inc. * Copyright (C) 2006 Hewlett-Packard Development Company, L.P. * Copyright (C) 2004-2006 Trusted Computer Solutions, Inc. - * Copyright (C) 2003 - 2004 Tresys Technology, LLC + * Copyright (C) 2003 - 2004, 2006 Tresys Technology, LLC * Copyright (C) 2003 Red Hat, Inc., James Morris * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -45,6 +49,7 @@ #include #include #include +#include #ifdef __linux__ extern void selnl_notify_policyload(u32 seqno); @@ -53,6 +58,11 @@ #endif unsigned int policydb_loaded_version; +/* + * This is declared in avc.c + */ +extern const struct selinux_class_perm selinux_class_perm; + lck_rw_t *policy_rwlock; #define POLICY_RDLOCK lck_rw_lock_shared(policy_rwlock) #define POLICY_WRLOCK lck_rw_lock_exclusive(policy_rwlock) @@ -395,7 +405,7 @@ if (context_struct_to_string(tcontext, &t, &tlen) < 0) goto out; audit_log(current->audit_context, GFP_ATOMIC, AUDIT_SELINUX_ERR, - "security_validate_transition: denied for" + "security_validate_transition: denied for" " oldcontext=%s newcontext=%s taskcontext=%s tclass=%s", o, n, t, policydb.p_class_val_to_name[tclass-1]); out: @@ -1023,86 +1033,112 @@ } /* - * Verify that each permission that is defined under the - * existing policy is still defined with the same value - * in the new policy. + * Verify that each kernel class that is defined in the + * policy is correct */ -static int validate_perm(void *key, void *datum, void *p) +static int validate_classes(struct policydb *p) { - struct hashtab *h; - struct perm_datum *perdatum, *perdatum2; - int rc = 0; + u32 i, j; + struct class_datum *cladatum; + struct perm_datum *perdatum; + u32 nprim, tmp, common_pts_len, perm_val, pol_val; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 25 18:52:22 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC15116A406; Thu, 25 Jan 2007 18:52:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 96B6E16A403 for ; Thu, 25 Jan 2007 18:52:21 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8879A13C428 for ; Thu, 25 Jan 2007 18:52:21 +0000 (UTC) (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 l0PIqLCA004502 for ; Thu, 25 Jan 2007 18:52:21 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0PIqL90004499 for perforce@freebsd.org; Thu, 25 Jan 2007 18:52:21 GMT (envelope-from millert@freebsd.org) Date: Thu, 25 Jan 2007 18:52:21 GMT Message-Id: <200701251852.l0PIqL90004499@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 113525 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2007 18:52:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=113525 Change 113525 by millert@millert_macbook on 2007/01/25 18:52:14 Remove old flask data; we use the refpolicy flask now. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/flask/Makefile#2 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/flask/README#2 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/flask/access_vectors#2 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/flask/initial_sids#2 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/flask/mkaccess_vector.sh#2 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/flask/mkflask.sh#2 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/flask/security_classes#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jan 25 18:59:31 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3966016A403; Thu, 25 Jan 2007 18:59:31 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0CB9316A400 for ; Thu, 25 Jan 2007 18:59:31 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id F13E713C45A for ; Thu, 25 Jan 2007 18:59:30 +0000 (UTC) (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 l0PIxUqY005220 for ; Thu, 25 Jan 2007 18:59:30 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0PIxUTT005217 for perforce@freebsd.org; Thu, 25 Jan 2007 18:59:30 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 25 Jan 2007 18:59:30 GMT Message-Id: <200701251859.l0PIxUTT005217@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 113526 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2007 18:59:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=113526 Change 113526 by hselasky@hselasky_mini_itx on 2007/01/25 18:59:18 Changes to make usb_subr.h more style compliant. Reorder structure elements to achieve integer alignment. Removed usbd_clear_endpoint_toggle() - unused. s/u_int /uint32_t/g s/int /int32_t/g s/u_int8_t/uint8_t/g s/u_int16_t/uint16_t/g s/u_int32_t/uint32_t/g Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#30 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#30 (text+ko) ==== @@ -36,10 +36,10 @@ */ #ifndef _USB_SUBR_H_ -#define _USB_SUBR_H_ +#define _USB_SUBR_H_ -#define USBD_STATUS_DESC(enum,value) #enum -#define USBD_STATUS(m)\ +#define USBD_STATUS_DESC(enum,value) #enum +#define USBD_STATUS(m)\ m(USBD_NORMAL_COMPLETION,=0 /* must be zero*/)\ /* errors */\ m(USBD_PENDING_REQUESTS,)\ @@ -82,22 +82,16 @@ struct module; struct malloc_type; struct proc; +struct usb_hid_descriptor; -typedef u_int8_t usbd_status; +typedef uint8_t usbd_status; typedef void (*usbd_callback_t)(struct usbd_xfer *); struct usbd_bus_methods { - void (*pipe_init)(struct usbd_device *udev, - usb_endpoint_descriptor_t *edesc, - struct usbd_pipe *pipe); + void (*pipe_init)(struct usbd_device *udev, usb_endpoint_descriptor_t *edesc, struct usbd_pipe *pipe); void (*do_poll)(struct usbd_bus *); - - usbd_status (*xfer_setup)(struct usbd_device *udev, - u_int8_t iface_index, - struct usbd_xfer **pxfer, - const struct usbd_config *setup_start, - const struct usbd_config *setup_end); + usbd_status (*xfer_setup)(struct usbd_device *udev, uint8_t iface_index, struct usbd_xfer **pxfer, const struct usbd_config *setup_start, const struct usbd_config *setup_end); }; struct usbd_pipe_methods { @@ -110,14 +104,14 @@ }; struct usbd_port { + struct usbd_device *device; /* connected device */ + struct usbd_device *parent; /* the ports hub */ + uint16_t power; /* mA of current on port */ usb_port_status_t status; - u_int16_t power; /* mA of current on port */ - u_int8_t portno; - u_int8_t restartcnt; - u_int8_t last_refcount; -#define USBD_RESTART_MAX 5 - struct usbd_device *device; /* connected device */ - struct usbd_device *parent; /* the ports hub */ + uint8_t portno; + uint8_t restartcnt; +#define USBD_RESTART_MAX 5 + uint8_t last_refcount; }; struct usbd_hub { @@ -127,36 +121,34 @@ struct usbd_port ports[0]; }; -/*****/ +#define USB_PAGE_SIZE PAGE_SIZE -#define USB_PAGE_SIZE PAGE_SIZE - struct usbd_page { - void *buffer; - bus_size_t physaddr; + void *buffer; + bus_size_t physaddr; #ifdef __FreeBSD__ - bus_dma_tag_t tag; - bus_dmamap_t map; - register_t intr_temp; + bus_dma_tag_t tag; + bus_dmamap_t map; + register_t intr_temp; #endif #ifdef __NetBSD__ - bus_dma_tag_t tag; - bus_dmamap_t map; - bus_dma_segment_t seg; - register_t intr_temp; - int32_t seg_count; + bus_dma_tag_t tag; + bus_dmamap_t map; + bus_dma_segment_t seg; + register_t intr_temp; + int32_t seg_count; #endif - u_int32_t length; - uint16_t exit_level; + uint32_t length; + uint16_t exit_level; }; struct usbd_page_search { - void *buffer; - struct usbd_page *page; - bus_size_t physaddr; - u_int32_t length; + void *buffer; + struct usbd_page *page; + bus_size_t physaddr; + uint32_t length; }; struct usbd_page_info { @@ -166,273 +158,254 @@ }; struct usbd_page_cache { - struct usbd_page * page_start; - struct usbd_page * page_end; - struct usbd_page * page_cur; - - u_int32_t page_offset_buf; - u_int32_t page_offset_cur; + struct usbd_page *page_start; + struct usbd_page *page_end; + struct usbd_page *page_cur; + uint32_t page_offset_buf; + uint32_t page_offset_cur; }; struct usbd_bus { - /* filled by HC driver */ - device_t bdev; /* base device, host adapter */ - struct usbd_bus_methods *methods; - bus_dma_tag_t dma_tag; + struct usb_device_stats stats; + struct mtx mtx; + struct usbd_port root_port; /* dummy port for root hub */ + + device_t bdev; /* filled by HC driver */ + bus_dma_tag_t dma_tag; /* filled by HC driver */ + struct usbd_bus_methods *methods; /* filled by HC driver */ + struct usbd_device *devices[USB_MAX_DEVICES]; + struct proc *event_thread; + + uint32_t no_intrs; - /* filled by USB driver */ - struct usbd_port root_port; /* dummy port for root hub */ - struct usbd_device * devices[USB_MAX_DEVICES]; - u_int8_t is_exploring; - u_int8_t wait_explore; - u_int8_t needs_explore;/* a hub signalled a change - * this variable is protected by + uint8_t is_exploring; + uint8_t wait_explore; + uint8_t needs_explore;/* Set if a hub signalled a change. + * This variable is protected by * "usb_global_lock" */ - u_int8_t use_polling; - u_int8_t usbrev; /* USB revision */ -#define USBREV_UNKNOWN 0 -#define USBREV_PRE_1_0 1 -#define USBREV_1_0 2 -#define USBREV_1_1 3 -#define USBREV_2_0 4 -#define USBREV_STR { "unknown", "pre 1.0", "1.0", "1.1", "2.0" } - - struct usb_device_stats stats; - struct mtx mtx; - struct proc * event_thread; - u_int32_t no_intrs; + uint8_t use_polling; + uint8_t usbrev; /* USB revision */ +#define USBREV_UNKNOWN 0 +#define USBREV_PRE_1_0 1 +#define USBREV_1_0 2 +#define USBREV_1_1 3 +#define USBREV_2_0 4 +#define USBREV_STR { "unknown", "pre 1.0", "1.0", "1.1", "2.0" } }; struct usbd_interface { usb_interface_descriptor_t *idesc; - u_int8_t alt_index; + uint8_t alt_index; }; -#define usbd_clear_endpoint_toggle(pipe) { \ -(pipe)->clearstall = 0; (pipe)->toggle_next = 0; } +struct usbd_pipe { + LIST_HEAD(, usbd_xfer) list_head; -struct usbd_pipe { usb_endpoint_descriptor_t *edesc; - LIST_HEAD(, usbd_xfer) list_head; - u_int16_t isoc_next; - u_int8_t toggle_next; - u_int8_t refcount; - u_int8_t clearstall; - u_int8_t iface_index; - /* default pipe does not use ``iface_index'' */ + struct usbd_pipe_methods *methods; /* set by HC driver */ + + uint16_t isoc_next; - /* filled by HC driver */ - struct usbd_pipe_methods *methods; + uint8_t toggle_next; + uint8_t refcount; + uint8_t clearstall; + uint8_t iface_index; /* not used by "default pipe" */ }; struct usbd_device { - struct usbd_bus *bus; /* our controller */ struct usbd_pipe default_pipe; /* pipe 0 */ - usb_endpoint_descriptor_t default_ep_desc; /* for pipe 0 */ - u_int8_t address; /* device addess */ - u_int8_t config; /* current configuration # */ - u_int8_t depth; /* distance from root hub */ - u_int8_t speed; /* low/full/high speed */ - u_int8_t self_powered; /* flag for self powered */ - u_int16_t power; /* mA the device uses */ - int16_t langid; /* language for strings */ -#define USBD_NOLANG (-1) + struct usbd_interface ifaces[USB_MAX_ENDPOINTS]; /* array of all interfaces */ + struct usbd_interface ifaces_end[0]; + struct usbd_pipe pipes[USB_MAX_ENDPOINTS]; /* array of all pipes */ + struct usbd_pipe pipes_end[0]; + + struct usbd_bus *bus; /* our controller */ + struct usbd_port *powersrc; /* upstream hub port, or 0 */ + struct usbd_port *myhsport; /* closest high speed port */ + struct usbd_device *myhub; /* upstream hub */ + const struct usbd_quirks *quirks; /* device quirks, always set */ + usb_config_descriptor_t *cdesc; /* full config descr */ + struct usbd_hub *hub; /* only if this is a hub */ + device_t subdevs[USB_MAX_ENDPOINTS]; /* array of all sub-devices */ + device_t subdevs_end[0]; + usb_event_cookie_t cookie; /* unique connection id */ - struct usbd_port * powersrc; /* upstream hub port, or 0 */ - struct usbd_port * myhsport; /* closest high speed port */ - struct usbd_device * myhub; /* upstream hub */ - usb_device_descriptor_t ddesc; /* device descriptor */ + uint16_t power; /* mA the device uses */ + int16_t langid; /* language for strings */ +#define USBD_NOLANG (-1) - usb_config_descriptor_t *cdesc; /* full config descr */ - const struct usbd_quirks *quirks; /* device quirks, always set */ - struct usbd_hub * hub; /* only if this is a hub */ + uint8_t address; /* device addess */ + uint8_t config; /* current configuration # */ + uint8_t depth; /* distance from root hub */ + uint8_t speed; /* low/full/high speed */ + uint8_t self_powered; /* flag for self powered */ - device_t subdevs[USB_MAX_ENDPOINTS]; /* array of all sub-devices */ - device_t subdevs_end[0]; - struct usbd_interface ifaces[USB_MAX_ENDPOINTS]; /* array of all interfaces */ - struct usbd_interface ifaces_end[0]; - struct usbd_pipe pipes[USB_MAX_ENDPOINTS]; /* array of all pipes */ - struct usbd_pipe pipes_end[0]; + usb_endpoint_descriptor_t default_ep_desc; /* for pipe 0 */ + usb_device_descriptor_t ddesc; /* device descriptor */ - u_int8_t ifaces_no_probe[(USB_MAX_ENDPOINTS + 7) / 8]; -#define USBD_SET_IFACE_NO_PROBE(udev, ii) \ + uint8_t ifaces_no_probe[(USB_MAX_ENDPOINTS + 7) / 8]; +#define USBD_SET_IFACE_NO_PROBE(udev, ii) \ { (udev)->ifaces_no_probe[(ii) >> 3] |= (1 << ((ii) & 7)); } -#define USBD_CLR_IFACE_NO_PROBE(udev, ii) \ +#define USBD_CLR_IFACE_NO_PROBE(udev, ii) \ { (udev)->ifaces_no_probe[(ii) >> 3] &= ~(1 << ((ii) & 7)); } -#define USBD_GET_IFACE_NO_PROBE(udev, ii) \ +#define USBD_GET_IFACE_NO_PROBE(udev, ii) \ ((udev)->ifaces_no_probe[(ii) >> 3] & (1 << ((ii) & 7))) - u_int8_t probed; /* probe state */ -#define USBD_PROBED_NOTHING 0 /* default value */ -#define USBD_PROBED_SPECIFIC_AND_FOUND 1 -#define USBD_PROBED_IFACE_AND_FOUND 2 -#define USBD_PROBED_GENERIC_AND_FOUND 3 + uint8_t probed; /* probe state */ +#define USBD_PROBED_NOTHING 0 /* default value */ +#define USBD_PROBED_SPECIFIC_AND_FOUND 1 +#define USBD_PROBED_IFACE_AND_FOUND 2 +#define USBD_PROBED_GENERIC_AND_FOUND 3 - u_int8_t serial[32]; - }; + uint8_t serial[32]; /* serial number */ +}; struct usbd_config { - u_int8_t type; /* pipe type */ - u_int8_t endpoint; /* pipe number */ + usbd_callback_t callback; - u_int8_t direction; /* pipe direction */ - u_int8_t interval; /* interrupt interval in milliseconds; - * used by interrupt pipes - */ -#define USBD_DEFAULT_INTERVAL 0 - - u_int16_t timeout; /* milliseconds */ - - u_int16_t frames; /* number of frames - * used in isochronous - * mode - */ - u_int8_t index; /* pipe index to use, if more - * than one descriptor matches - * type, address, direction ... - */ - - u_int32_t flags; /* flags */ -#define USBD_SYNCHRONOUS 0x0001 /* wait for completion */ -#define USBD_FORCE_SHORT_XFER 0x0002 /* force a short packet last */ + uint32_t flags; /* flags */ +#define USBD_SYNCHRONOUS 0x0001 /* wait for completion */ +#define USBD_FORCE_SHORT_XFER 0x0002 /* force a short packet last */ #if (USBD_SHORT_XFER_OK != 0x0004) -#define USBD_SHORT_XFER_OK 0x0004 /* allow short reads +#define USBD_SHORT_XFER_OK 0x0004 /* allow short reads * NOTE: existing software * expects USBD_SHORT_XFER_OK * to have a value of 0x4. This * flag is also exported by usb.h */ #endif -#define USBD_CUSTOM_CLEARSTALL 0x0008 /* used to disable automatic clear-stall +#define USBD_CUSTOM_CLEARSTALL 0x0008 /* used to disable automatic clear-stall * when a device reset request is needed * in addition to the clear stall request */ -#define USBD_DEV_OPEN 0x0010 -#define USBD_DEV_RECURSED_1 0x0020 -#define USBD_DEV_RECURSED_2 0x0040 -#define USBD_DEV_TRANSFERRING 0x0080 -#define USBD_BANDWIDTH_RECLAIMED 0x0100 -#define USBD_USE_POLLING 0x0200 /* used to make synchronous transfers +#define USBD_DEV_OPEN 0x0010 +#define USBD_DEV_RECURSED_1 0x0020 +#define USBD_DEV_RECURSED_2 0x0040 +#define USBD_DEV_TRANSFERRING 0x0080 +#define USBD_BANDWIDTH_RECLAIMED 0x0100 +#define USBD_USE_POLLING 0x0200 /* used to make synchronous transfers * use polling instead of sleep/wakeup */ -#define USBD_UNUSED_3 0x0400 -#define USBD_USE_DMA 0x0800 -#define USBD_UNUSED_4 0x1000 -#define USBD_UNUSED_5 0x2000 -#define USBD_UNUSED_6 0x4000 -#define USBD_UNUSED_7 0x8000 +#define USBD_UNUSED_3 0x0400 +#define USBD_USE_DMA 0x0800 +#define USBD_UNUSED_4 0x1000 +#define USBD_UNUSED_5 0x2000 +#define USBD_UNUSED_6 0x4000 +#define USBD_UNUSED_7 0x8000 - u_int32_t bufsize; /* total pipe buffer size in bytes */ - usbd_callback_t callback; -}; + uint32_t bufsize; /* total pipe buffer size in bytes */ -#define USBD_TRANSFER_IN_PROGRESS(xfer) \ - ((xfer)->flags & USBD_DEV_TRANSFERRING) + uint16_t timeout; /* milliseconds */ -struct usbd_xfer { - struct usbd_pipe * pipe; - struct usbd_device * udev; - void * buffer; - void * priv_sc; - void * priv_fifo; - struct mtx * priv_mtx; - struct usbd_xfer * clearstall_xfer; - u_int32_t length; /* bytes */ - u_int32_t actlen; /* bytes */ + uint16_t frames; /* number of frames + * used in isochronous + * mode + */ + uint8_t type; /* pipe type */ + uint8_t endpoint; /* pipe number */ - u_int32_t flags; + uint8_t direction; /* pipe direction */ + uint8_t interval; /* interrupt interval in milliseconds; + * used by interrupt pipes + */ +#define USBD_DEFAULT_INTERVAL 0 - u_int32_t timeout; /* milliseconds */ -#define USBD_NO_TIMEOUT 0 -#define USBD_DEFAULT_TIMEOUT 5000 /* 5000 ms = 5 seconds */ + uint8_t index; /* pipe index to use, if more + * than one descriptor matches + * type, address, direction ... + */ +}; - usbd_status error; - usbd_callback_t callback; +#define USBD_TRANSFER_IN_PROGRESS(xfer) \ + ((xfer)->flags & USBD_DEV_TRANSFERRING) - /* for isochronous transfers */ - u_int16_t * frlengths; - u_int16_t * frlengths_old; - u_int32_t nframes; +struct usbd_xfer { + struct __callout timeout_handle; + struct usbd_page_cache buf_data; /* buffer page cache */ + struct usbd_page_cache buf_fixup; /* fixup buffer */ + LIST_ENTRY(usbd_xfer) interrupt_list; /* used by HC driver */ + LIST_ENTRY(usbd_xfer) pipe_list; /* used by HC driver */ - /* - * used by HC driver - */ + struct usbd_pipe *pipe; + struct usbd_device *udev; + struct usbd_xfer *clearstall_xfer; + struct mtx *priv_mtx; + struct mtx *usb_mtx; /* used by HC driver */ + struct usbd_memory_info *usb_root; /* used by HC driver */ + struct thread *usb_thread; /* used by HC driver */ + void *usb_sc; /* used by HC driver */ + void *qh_start; /* used by HC driver */ + void *td_start; /* used by HC driver */ + void *td_transfer_first; /* used by HC driver */ + void *td_transfer_last; /* used by HC driver */ + void *td_transfer_cache; /* used by HC driver */ + void *priv_sc; + void *priv_fifo; + void *buffer; + uint16_t *frlengths; + uint16_t *frlengths_old; + usbd_callback_t callback; - void * usb_sc; - struct mtx * usb_mtx; - struct usbd_memory_info *usb_root; - struct thread * usb_thread; - u_int32_t usb_refcount; + uint32_t length; /* bytes */ + uint32_t actlen; /* bytes */ + uint32_t flags; + uint32_t timeout; /* milliseconds */ +#define USBD_NO_TIMEOUT 0 +#define USBD_DEFAULT_TIMEOUT 5000 /* 5000 ms = 5 seconds */ - /* pipe_list is used to start next transfer */ + uint32_t nframes; /* for isochronous transfers */ + uint32_t usb_refcount; /* used by HC driver */ - LIST_ENTRY(usbd_xfer) pipe_list; + uint16_t max_packet_size; + uint16_t max_frame_size; + uint16_t qh_pos; - /* interrupt_list is used to check - * for finished transfers - */ - - LIST_ENTRY(usbd_xfer) interrupt_list; - - struct __callout timeout_handle; - - u_int8_t address; - u_int8_t endpoint; - u_int8_t interval; /* milliseconds */ + uint8_t address; + uint8_t endpoint; + uint8_t interval; /* milliseconds */ uint8_t max_packet_count; - u_int16_t max_packet_size; - u_int16_t max_frame_size; - u_int16_t qh_pos; - - struct usbd_page_cache buf_data; /* buffer page cache */ - struct usbd_page_cache buf_fixup; /* fixup buffer */ - - void *qh_start; - - void *td_start; - void *td_transfer_first; - void *td_transfer_last; - void *td_transfer_cache; + usbd_status error; }; struct usbd_memory_info { - void * memory_base; - u_int32_t memory_size; - u_int32_t memory_refcount; - u_int32_t setup_refcount; - struct mtx * priv_mtx; - struct mtx * usb_mtx; - struct usbd_page * page_base; - u_int32_t page_size; + void *memory_base; + struct mtx *priv_mtx; + struct mtx *usb_mtx; + struct usbd_page *page_base; + + uint32_t memory_size; + uint32_t memory_refcount; + uint32_t setup_refcount; + uint32_t page_size; }; struct usbd_callback_info { - struct usbd_xfer *xfer; - u_int32_t refcount; + struct usbd_xfer *xfer; + uint32_t refcount; }; struct usbd_mbuf { - u_int8_t *cur_data_ptr; - u_int8_t *min_data_ptr; - struct usbd_mbuf *usbd_nextpkt; - struct usbd_mbuf *usbd_next; + uint8_t *cur_data_ptr; + uint8_t *min_data_ptr; + struct usbd_mbuf *usbd_nextpkt; + struct usbd_mbuf *usbd_next; - u_int32_t cur_data_len; - u_int32_t max_data_len; + uint32_t cur_data_len; + uint32_t max_data_len; }; struct usbd_ifqueue { - struct usbd_mbuf *ifq_head; - struct usbd_mbuf *ifq_tail; + struct usbd_mbuf *ifq_head; + struct usbd_mbuf *ifq_tail; - int32_t ifq_len; - int32_t ifq_maxlen; + int32_t ifq_len; + int32_t ifq_maxlen; }; -#define USBD_IF_ENQUEUE(ifq, m) do { \ +#define USBD_IF_ENQUEUE(ifq, m) do { \ (m)->usbd_nextpkt = NULL; \ if ((ifq)->ifq_tail == NULL) \ (ifq)->ifq_head = (m); \ @@ -442,7 +415,7 @@ (ifq)->ifq_len++; \ } while (0) -#define USBD_IF_DEQUEUE(ifq, m) do { \ +#define USBD_IF_DEQUEUE(ifq, m) do { \ (m) = (ifq)->ifq_head; \ if (m) { \ if (((ifq)->ifq_head = (m)->usbd_nextpkt) == NULL) { \ @@ -453,7 +426,7 @@ } \ } while (0) -#define USBD_IF_PREPEND(ifq, m) do { \ +#define USBD_IF_PREPEND(ifq, m) do { \ (m)->usbd_nextpkt = (ifq)->ifq_head; \ if ((ifq)->ifq_tail == NULL) { \ (ifq)->ifq_tail = (m); \ @@ -462,11 +435,11 @@ (ifq)->ifq_len++; \ } while (0) -#define USBD_IF_QFULL(ifq) ((ifq)->ifq_len >= (ifq)->ifq_maxlen) -#define USBD_IF_QLEN(ifq) ((ifq)->ifq_len) -#define USBD_IF_POLL(ifq, m) ((m) = (ifq)->ifq_head) +#define USBD_IF_QFULL(ifq) ((ifq)->ifq_len >= (ifq)->ifq_maxlen) +#define USBD_IF_QLEN(ifq) ((ifq)->ifq_len) +#define USBD_IF_POLL(ifq, m) ((m) = (ifq)->ifq_head) -#define USBD_MBUF_RESET(m) do { \ +#define USBD_MBUF_RESET(m) do { \ (m)->cur_data_ptr = (m)->min_data_ptr; \ (m)->cur_data_len = (m)->max_data_len; \ } while (0) @@ -477,676 +450,360 @@ struct usbd_config_td_softc; struct usbd_config_td_cc; -typedef void (usbd_config_td_command_t) - (struct usbd_config_td_softc *sc, - struct usbd_config_td_cc *cc, - u_int16_t reference); - -typedef void (usbd_config_td_config_copy_t) - (struct usbd_config_td_softc *sc, - struct usbd_config_td_cc *cc, - u_int16_t reference); - -typedef void (usbd_config_td_end_of_commands_t) - (struct usbd_config_td_softc *sc); +typedef void (usbd_config_td_command_t)(struct usbd_config_td_softc *sc, struct usbd_config_td_cc *cc, uint16_t reference); +typedef void (usbd_config_td_config_copy_t)(struct usbd_config_td_softc *sc, struct usbd_config_td_cc *cc, uint16_t reference); +typedef void (usbd_config_td_end_of_commands_t)(struct usbd_config_td_softc *sc); struct usbd_config_td { - struct usbd_ifqueue cmd_free; - struct usbd_ifqueue cmd_used; + struct usbd_ifqueue cmd_free; + struct usbd_ifqueue cmd_used; - struct proc * config_thread; - struct mtx * p_mtx; - void * p_softc; - void * p_cmd_queue; + struct proc *config_thread; + struct mtx *p_mtx; + void *p_softc; + void *p_cmd_queue; + usbd_config_td_config_copy_t *p_config_copy; + usbd_config_td_end_of_commands_t *p_end_of_commands; - usbd_config_td_config_copy_t *p_config_copy; - usbd_config_td_end_of_commands_t *p_end_of_commands; + uint8_t wakeup_config_td; + uint8_t wakeup_config_td_gone; - u_int8_t wakeup_config_td; - u_int8_t wakeup_config_td_gone; - - u_int8_t flag_config_td_sleep; - u_int8_t flag_config_td_gone; + uint8_t flag_config_td_sleep; + uint8_t flag_config_td_gone; }; struct usbd_config_td_item { - usbd_config_td_command_t *command_func; - u_int16_t command_ref; -} __attribute__((__aligned__(USB_HOST_ALIGN))); + usbd_config_td_command_t *command_func; + uint16_t command_ref; +} __aligned(USB_HOST_ALIGN); /*---------------------------------------------------------------------------* * structures used by probe and attach *---------------------------------------------------------------------------*/ struct usb_devno { - u_int16_t ud_vendor; - u_int16_t ud_product; + uint16_t ud_vendor; + uint16_t ud_product; } __packed; -#define usb_lookup(tbl, vendor, product) usb_match_device \ +#define usb_lookup(tbl, vendor, product) usb_match_device \ ((const struct usb_devno *)(tbl), (sizeof (tbl) / sizeof ((tbl)[0])), \ sizeof ((tbl)[0]), (vendor), (product)) \ /**/ #define USB_PRODUCT_ANY 0xffff -struct usb_attach_arg -{ - int port; - int configno; - int iface_index; - int vendor; - int product; - int release; - int matchlvl; - struct usbd_device *device; /* current device */ - struct usbd_interface *iface; /* current interface */ - int usegeneric; - struct usbd_interface *ifaces_start; /* all interfaces */ - struct usbd_interface *ifaces_end; /* exclusive */ +struct usb_attach_arg { + struct usbd_device *device; /* current device */ + struct usbd_interface *iface; /* current interface */ + struct usbd_interface *ifaces_start; /* all interfaces */ + struct usbd_interface *ifaces_end; /* exclusive */ + + uint16_t vendor; + uint16_t product; + uint16_t release; + + uint8_t port; + uint8_t configno; + uint8_t iface_index; + uint8_t usegeneric; }; /* return values for device_probe() method: */ -#define UMATCH_VENDOR_PRODUCT_REV (-10) -#define UMATCH_VENDOR_PRODUCT (-20) -#define UMATCH_VENDOR_DEVCLASS_DEVPROTO (-30) -#define UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO (-40) -#define UMATCH_DEVCLASS_DEVSUBCLASS (-50) -#define UMATCH_VENDOR_PRODUCT_REV_CONF_IFACE (-60) -#define UMATCH_VENDOR_PRODUCT_CONF_IFACE (-70) -#define UMATCH_VENDOR_IFACESUBCLASS_IFACEPROTO (-80) -#define UMATCH_VENDOR_IFACESUBCLASS (-90) -#define UMATCH_IFACECLASS_IFACESUBCLASS_IFACEPROTO (-100) -#define UMATCH_IFACECLASS_IFACESUBCLASS (-110) -#define UMATCH_IFACECLASS (-120) -#define UMATCH_IFACECLASS_GENERIC (-130) -#define UMATCH_GENERIC (-140) -#define UMATCH_NONE (ENXIO) +#define UMATCH_VENDOR_PRODUCT_REV (-10) +#define UMATCH_VENDOR_PRODUCT (-20) +#define UMATCH_VENDOR_DEVCLASS_DEVPROTO (-30) +#define UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO (-40) +#define UMATCH_DEVCLASS_DEVSUBCLASS (-50) +#define UMATCH_VENDOR_PRODUCT_REV_CONF_IFACE (-60) +#define UMATCH_VENDOR_PRODUCT_CONF_IFACE (-70) +#define UMATCH_VENDOR_IFACESUBCLASS_IFACEPROTO (-80) +#define UMATCH_VENDOR_IFACESUBCLASS (-90) +#define UMATCH_IFACECLASS_IFACESUBCLASS_IFACEPROTO (-100) +#define UMATCH_IFACECLASS_IFACESUBCLASS (-110) +#define UMATCH_IFACECLASS (-120) +#define UMATCH_IFACECLASS_GENERIC (-130) +#define UMATCH_GENERIC (-140) +#define UMATCH_NONE (ENXIO) /*---------------------------------------------------------------------------* * prototypes *---------------------------------------------------------------------------*/ -/* routines from usb_subr.c */ +/* prototypes from usb_subr.c */ -void -usbd_devinfo(struct usbd_device *udev, int showclass, - char *dst_ptr, u_int16_t dst_len); - -const char * -usbd_errstr(usbd_status err); - -void -usb_delay_ms(struct usbd_bus *bus, u_int ms); - -void -usbd_delay_ms(struct usbd_device *udev, u_int ms); - -usb_descriptor_t * -usbd_desc_foreach(usb_config_descriptor_t *cd, usb_descriptor_t *desc); - -struct usb_hid_descriptor; -struct usb_hid_descriptor * -usbd_get_hdesc(usb_config_descriptor_t *cd, usb_interface_descriptor_t *id); - -usb_interface_descriptor_t * -usbd_find_idesc(usb_config_descriptor_t *cd, u_int16_t iface_index, u_int16_t alt_index); - -usb_endpoint_descriptor_t * -usbd_find_edesc(usb_config_descriptor_t *cd, u_int16_t iface_index, u_int16_t alt_index, - u_int16_t endptidx); - -usb_descriptor_t * -usbd_find_descriptor(usb_config_descriptor_t *cd, int type, int subtype); +#define USBD_SUBTYPE_ANY (-1) -#define USBD_SUBTYPE_ANY (-1) - -int -usbd_get_no_alts(usb_config_descriptor_t *cd, u_int8_t ifaceno); - -usbd_status -usbd_search_and_set_config(struct usbd_device *udev, int no, int msg); - -usbd_status -usbd_set_config_index(struct usbd_device *udev, int index, int msg); - -int -usbd_fill_deviceinfo(struct usbd_device *udev, struct usb_device_info *di, - int usedev); - -usbd_status -usbd_fill_iface_data(struct usbd_device *udev, int iface_index, int alt_index); - -usbd_status -usbd_probe_and_attach(device_t parent, - int port, struct usbd_port *up); - -usbd_status -usbd_new_device(device_t parent, struct usbd_bus *bus, int depth, - int speed, int port, struct usbd_port *up); - -void -usbd_free_device(struct usbd_port *up, u_int8_t free_subdev); - -void -usb_detach_wait(device_t dv); - -void -usb_detach_wakeup(device_t dv); - -struct usbd_interface * -usbd_get_iface(struct usbd_device *udev, u_int8_t iface_index); - -void -usbd_set_desc(device_t dev, struct usbd_device *udev); - -void * -usbd_alloc_mbufs(struct malloc_type *type, struct usbd_ifqueue *ifq, - u_int32_t block_size, u_int16_t block_number); -void -usbd_get_page(struct usbd_page_cache *cache, u_int32_t offset, - struct usbd_page_search *res); -void -usbd_copy_in(struct usbd_page_cache *cache, u_int32_t offset, - const void *ptr, u_int32_t len); -void -usbd_m_copy_in(struct usbd_page_cache *cache, u_int32_t dst_offset, - struct mbuf *m, u_int32_t src_offset, u_int32_t src_len); -void -usbd_copy_out(struct usbd_page_cache *cache, u_int32_t offset, - void *ptr, u_int32_t len); -void -usbd_bzero(struct usbd_page_cache *cache, u_int32_t offset, u_int32_t len); - -u_int8_t -usbd_page_alloc(bus_dma_tag_t tag, struct usbd_page *page, - u_int32_t npages); -void -usbd_page_free(struct usbd_page *page, u_int32_t npages); - -void usbd_page_get_info(struct usbd_page *page, u_int32_t size, struct usbd_page_info *info); - -void -usbd_page_set_start(struct usbd_page_cache *pc, struct usbd_page *page_ptr, - u_int32_t size); -void -usbd_page_set_end(struct usbd_page_cache *pc, struct usbd_page *page_ptr, - u_int32_t size); -u_int32_t -usbd_page_fit_obj(struct usbd_page *page, u_int32_t size, u_int32_t obj_len); - -void * usbd_mem_alloc(bus_dma_tag_t parent, struct usbd_page *page, uint32_t size, uint8_t align_power); - -void usbd_mem_free(struct usbd_page *page); - -bus_dma_tag_t -usbd_dma_tag_alloc(bus_dma_tag_t parent, u_int32_t size, u_int32_t alignment); - -void -usbd_dma_tag_free(bus_dma_tag_t tag); - -void * -usbd_mem_alloc_sub(bus_dma_tag_t tag, struct usbd_page *page, - u_int32_t size, u_int32_t alignment); -void -usbd_mem_free_sub(struct usbd_page *page); - -void usbd_page_dma_exit(struct usbd_page *page); -void usbd_page_dma_enter(struct usbd_page *page); - #ifdef __FreeBSD__ #if (__FreeBSD_version >= 700020) -#define device_get_dma_tag(dev) bus_get_dma_tag(dev) +#define device_get_dma_tag(dev) bus_get_dma_tag(dev) #else -#define device_get_dma_tag(dev) NULL /* XXX */ +#define device_get_dma_tag(dev) NULL /* XXX */ #endif #endif -void usbd_std_transfer_setup(struct usbd_xfer *xfer, const struct usbd_config *setup, u_int16_t max_packet_size, u_int16_t max_frame_size, uint8_t max_packet_count); +void usbd_devinfo(struct usbd_device *udev, int32_t showclass, char *dst_ptr, uint16_t dst_len); +const char * usbd_errstr(usbd_status err); +void usb_delay_ms(struct usbd_bus *bus, uint32_t ms); +void usbd_delay_ms(struct usbd_device *udev, uint32_t ms); +usb_descriptor_t *usbd_desc_foreach(usb_config_descriptor_t *cd, usb_descriptor_t *desc); +struct usb_hid_descriptor *usbd_get_hdesc(usb_config_descriptor_t *cd, usb_interface_descriptor_t *id); +usb_interface_descriptor_t *usbd_find_idesc(usb_config_descriptor_t *cd, uint16_t iface_index, uint16_t alt_index); +usb_endpoint_descriptor_t *usbd_find_edesc(usb_config_descriptor_t *cd, uint16_t iface_index, uint16_t alt_index, uint16_t endptidx); +usb_descriptor_t *usbd_find_descriptor(usb_config_descriptor_t *cd, int32_t type, int32_t subtype); +int usbd_get_no_alts(usb_config_descriptor_t *cd, uint8_t ifaceno); +usbd_status usbd_search_and_set_config(struct usbd_device *udev, int32_t no, int32_t msg); +usbd_status usbd_set_config_index(struct usbd_device *udev, int32_t index, int32_t msg); +int usbd_fill_deviceinfo(struct usbd_device *udev, struct usb_device_info *di, int32_t usedev); +usbd_status usbd_fill_iface_data(struct usbd_device *udev, int32_t iface_index, int32_t alt_index); +usbd_status usbd_probe_and_attach(device_t parent, int32_t port, struct usbd_port *up); +usbd_status usbd_new_device(device_t parent, struct usbd_bus *bus, int32_t depth, int32_t speed, int32_t port, struct usbd_port *up); +void usbd_free_device(struct usbd_port *up, uint8_t free_subdev); +void usb_detach_wait(device_t dv); +void usb_detach_wakeup(device_t dv); +struct usbd_interface *usbd_get_iface(struct usbd_device *udev, uint8_t iface_index); +void usbd_set_desc(device_t dev, struct usbd_device *udev); +void * usbd_alloc_mbufs(struct malloc_type *type, struct usbd_ifqueue *ifq, uint32_t block_size, uint16_t block_number); +void usbd_get_page(struct usbd_page_cache *cache, uint32_t offset, struct usbd_page_search *res); +void usbd_copy_in(struct usbd_page_cache *cache, uint32_t offset, const void *ptr, uint32_t len); +void usbd_m_copy_in(struct usbd_page_cache *cache, uint32_t dst_offset, struct mbuf *m, uint32_t src_offset, uint32_t src_len); +void usbd_copy_out(struct usbd_page_cache *cache, uint32_t offset, void *ptr, uint32_t len); +void usbd_bzero(struct usbd_page_cache *cache, uint32_t offset, uint32_t len); +uint8_t usbd_page_alloc(bus_dma_tag_t tag, struct usbd_page *page, uint32_t npages); +void usbd_page_free(struct usbd_page *page, uint32_t npages); +void usbd_page_get_info(struct usbd_page *page, uint32_t size, struct usbd_page_info *info); +void usbd_page_set_start(struct usbd_page_cache *pc, struct usbd_page *page_ptr, uint32_t size); +void usbd_page_set_end(struct usbd_page_cache *pc, struct usbd_page *page_ptr,uint32_t size); +uint32_t usbd_page_fit_obj(struct usbd_page *page, uint32_t size, uint32_t obj_len); +void * usbd_mem_alloc(bus_dma_tag_t parent, struct usbd_page *page, uint32_t size, uint8_t align_power); +void usbd_mem_free(struct usbd_page *page); +bus_dma_tag_t usbd_dma_tag_alloc(bus_dma_tag_t parent, uint32_t size, uint32_t alignment); +void usbd_dma_tag_free(bus_dma_tag_t tag); +void * usbd_mem_alloc_sub(bus_dma_tag_t tag, struct usbd_page *page, uint32_t size, uint32_t alignment); +void usbd_mem_free_sub(struct usbd_page *page); +void usbd_page_dma_exit(struct usbd_page *page); +void usbd_page_dma_enter(struct usbd_page *page); +void usbd_std_transfer_setup(struct usbd_xfer *xfer, const struct usbd_config *setup, uint16_t max_packet_size, uint16_t max_frame_size, uint8_t max_packet_count); +uint8_t usbd_make_str_desc(void *ptr, uint16_t max_len, const char *s); +uint32_t mtx_drop_recurse(struct mtx *mtx); +void mtx_pickup_recurse(struct mtx *mtx, uint32_t recurse_level); +uint8_t usbd_config_td_setup(struct usbd_config_td *ctd, void *priv_sc, struct mtx *priv_mtx, usbd_config_td_config_copy_t *p_func_cc, usbd_config_td_end_of_commands_t *p_func_eoc, uint16_t item_size, uint16_t item_count); +void usbd_config_td_stop(struct usbd_config_td *ctd); +void usbd_config_td_unsetup(struct usbd_config_td *ctd); +void usbd_config_td_queue_command(struct usbd_config_td *ctd, usbd_config_td_command_t *command_func, uint16_t command_ref); +uint8_t usbd_config_td_is_gone(struct usbd_config_td *ctd); +uint8_t usbd_config_td_sleep(struct usbd_config_td *ctd, uint32_t timeout); +struct mbuf * usbd_ether_get_mbuf(void); +int32_t device_delete_all_children(device_t dev); +uint16_t usbd_get_max_packet_size(usb_endpoint_descriptor_t *edesc); +uint16_t usbd_get_max_packet_count(usb_endpoint_descriptor_t *edesc); +uint16_t usbd_get_max_frame_size(usb_endpoint_descriptor_t *edesc); +void usbd_set_max_packet_size_count(usb_endpoint_descriptor_t *edesc, uint16_t size, uint16_t count); -u_int8_t -usbd_make_str_desc(void *ptr, u_int16_t max_len, const char *s); - -u_int32_t -mtx_drop_recurse(struct mtx *mtx); +/* prototypes from usb.c */ -void -mtx_pickup_recurse(struct mtx *mtx, u_int32_t recurse_level); - -u_int8_t -usbd_config_td_setup(struct usbd_config_td *ctd, void *priv_sc, - struct mtx *priv_mtx, - usbd_config_td_config_copy_t *p_func_cc, - usbd_config_td_end_of_commands_t *p_func_eoc, - u_int16_t item_size, u_int16_t item_count); -void -usbd_config_td_stop(struct usbd_config_td *ctd); - -void -usbd_config_td_unsetup(struct usbd_config_td *ctd); - -void -usbd_config_td_queue_command(struct usbd_config_td *ctd, - usbd_config_td_command_t *command_func, - u_int16_t command_ref); -u_int8_t -usbd_config_td_is_gone(struct usbd_config_td *ctd); - -u_int8_t -usbd_config_td_sleep(struct usbd_config_td *ctd, u_int32_t timeout); - -struct mbuf * -usbd_ether_get_mbuf(void); - -int32_t device_delete_all_children(device_t dev); - -uint16_t usbd_get_max_packet_size(usb_endpoint_descriptor_t *edesc); -uint16_t usbd_get_max_packet_count(usb_endpoint_descriptor_t *edesc); -uint16_t usbd_get_max_frame_size(usb_endpoint_descriptor_t *edesc); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jan 25 19:03:37 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15D2016A406; Thu, 25 Jan 2007 19:03:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DF99816A401 for ; Thu, 25 Jan 2007 19:03:36 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B870913C442 for ; Thu, 25 Jan 2007 19:03:36 +0000 (UTC) (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 l0PJ3agk007467 for ; Thu, 25 Jan 2007 19:03:36 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0PJ3aN9007463 for perforce@freebsd.org; Thu, 25 Jan 2007 19:03:36 GMT (envelope-from millert@freebsd.org) Date: Thu, 25 Jan 2007 19:03:36 GMT Message-Id: <200701251903.l0PJ3aN9007463@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 113527 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2007 19:03:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=113527 Change 113527 by millert@millert_macbook on 2007/01/25 19:02:47 Update to match the avc.c we are using. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc-selinux.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc-selinux.c#3 (text+ko) ==== @@ -32,12 +32,7 @@ #include "avc.h" #include "avc_ss.h" -static const struct av_perm_to_string -{ - u16 tclass; - u32 value; - const char *name; -} av_perm_to_string[] = { +static const struct av_perm_to_string av_perm_to_string[] = { #define S_(c, v, s) { c, v, s }, #include "av_perm_to_string.h" #undef S_ @@ -57,17 +52,21 @@ #undef TE_ #undef S_ -static const struct av_inherit -{ - u16 tclass; - const char **common_pts; - u32 common_base; -} av_inherit[] = { +static const struct av_inherit av_inherit[] = { #define S_(c, i, b) { c, common_##i##_perm_to_string, b }, #include "av_inherit.h" #undef S_ }; +const struct selinux_class_perm selinux_class_perm = { + av_perm_to_string, + ARRAY_SIZE(av_perm_to_string), + class_to_string, + ARRAY_SIZE(class_to_string), + av_inherit, + ARRAY_SIZE(av_inherit) +}; + #define AVC_CACHE_SLOTS 512 #define AVC_DEF_CACHE_THRESHOLD 512 #define AVC_CACHE_RECLAIM 16 @@ -125,7 +124,7 @@ static struct avc_cache avc_cache; static struct avc_callback_node *avc_callbacks; -static kmem_cache_t *avc_node_cachep; +static struct kmem_cache *avc_node_cachep; static inline int avc_hash(u32 ssid, u32 tsid, u16 tclass) { @@ -333,7 +332,7 @@ { struct avc_node *node; - node = kmem_cache_alloc(avc_node_cachep, SLAB_ATOMIC); + node = kmem_cache_alloc(avc_node_cachep, GFP_ATOMIC); if (!node) goto out; @@ -497,7 +496,7 @@ audit_log_format(ab, " %s=%d", name2, ntohs(port)); } -static inline void avc_print_ipv4_addr(struct audit_buffer *ab, u32 addr, +static inline void avc_print_ipv4_addr(struct audit_buffer *ab, __be32 addr, __be16 port, char *name1, char *name2) { if (addr) From owner-p4-projects@FreeBSD.ORG Thu Jan 25 20:35:30 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 843BB16A403; Thu, 25 Jan 2007 20:35:30 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5F59D16A401 for ; Thu, 25 Jan 2007 20:35:30 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5118A13C45E for ; Thu, 25 Jan 2007 20:35:30 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0PKZUhX026004 for ; Thu, 25 Jan 2007 20:35:30 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0PKZU1d026001 for perforce@freebsd.org; Thu, 25 Jan 2007 20:35:30 GMT (envelope-from zec@FreeBSD.org) Date: Thu, 25 Jan 2007 20:35:30 GMT Message-Id: <200701252035.l0PKZU1d026001@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 113531 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2007 20:35:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=113531 Change 113531 by zec@zec_tca51 on 2007/01/25 20:34:29 Remove stale printf()s. Affected files ... .. //depot/projects/vimage/src/sys/net/if_clone.c#3 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if_clone.c#3 (text+ko) ==== @@ -400,7 +400,6 @@ IF_CLONE_LOCK(ifc); -printf("ifc_alloc_unit: query for %s %d\n", ifc->ifc_name, *unit); bytoff = bitoff = 0; wildcard = (*unit < 0); /* @@ -424,7 +423,6 @@ } IFNET_RUNLOCK(); *unit = i; -printf("ifc_alloc_unit: available is %s\n", name); #else while ((bytoff < ifc->ifc_bmlen) && (ifc->ifc_units[bytoff] == 0xff)) @@ -546,7 +544,6 @@ wildcard = (unit < 0); err = ifc_alloc_unit(ifc, &unit); -printf("if_simple_create err=%d\n", err); if (err != 0) return (err); From owner-p4-projects@FreeBSD.ORG Thu Jan 25 22:39:51 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1E8216A40A; Thu, 25 Jan 2007 22:39:51 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 846FF16A402 for ; Thu, 25 Jan 2007 22:39:51 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from harmony.bsdimp.com (vc4-2-0-87.dsl.netrack.net [199.45.160.85]) by mx1.freebsd.org (Postfix) with ESMTP id 22C2113C459 for ; Thu, 25 Jan 2007 22:39:51 +0000 (UTC) (envelope-from imp@bsdimp.com) Received: from localhost (localhost [127.0.0.1]) by harmony.bsdimp.com (8.13.4/8.13.4) with ESMTP id l0PMdYod032570; Thu, 25 Jan 2007 15:39:35 -0700 (MST) (envelope-from imp@bsdimp.com) Date: Thu, 25 Jan 2007 15:40:04 -0700 (MST) Message-Id: <20070125.154004.-957810070.imp@bsdimp.com> To: hselasky@c2i.net From: "M. Warner Losh" In-Reply-To: <200701191057.25656.hselasky@c2i.net> References: <200701152255.l0FMtKId033379@repoman.freebsd.org> <20070119.015122.514366110.imp@bsdimp.com> <200701191057.25656.hselasky@c2i.net> X-Mailer: Mew version 4.2 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0 (harmony.bsdimp.com [127.0.0.1]); Thu, 25 Jan 2007 15:39:36 -0700 (MST) Cc: perforce@freebsd.org Subject: Re: PERFORCE change 112957 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2007 22:39:52 -0000 In message: <200701191057.25656.hselasky@c2i.net> Hans Petter Selasky writes: : On Friday 19 January 2007 09:51, M. Warner Losh wrote: : > In message: <200701152255.l0FMtKId033379@repoman.freebsd.org> : > : > Hans Petter Selasky writes: : > : ==== //depot/projects/usb/src/sys/dev/pccbb/pccbb.c#3 (text+ko) ==== : > : : > : @@ -302,10 +302,11 @@ : > : * for the kldload/unload case to work. If we failed to do that, then : > : * we'd get duplicate devices when cbb.ko was reloaded. : > : */ : > : - device_get_children(brdev, &devlist, &numdevs); : > : - for (tmp = 0; tmp < numdevs; tmp++) : > : - device_delete_child(brdev, devlist[tmp]); : > : - free(devlist, M_TEMP); : > : + if (!device_get_children(brdev, &devlist, &numdevs)) { : > : + for (tmp = 0; tmp < numdevs; tmp++) : > : > Actually this is a problem. While the old code ignores errors, I : > don't think that's really the right thing to do here. It is critical : > that the children be deleted. : > : : Then maybe you should implement a "device_for_each_safe()" function that : iterates the devices? : : Or something like "device_get_first_child()" ? If we had a topology lock for newbus, like we do for geom, then we could return the child's memory directly w/o worrying that it will change out from under the caller. : BTW: I see that several places "device_get_children()" is used in combination : with "device_delete_child()". How about factoring that out. I currently put : the following in "usb_subr.c": : : /*---------------------------------------------------------------------------* : * device_delete_all_children - delete all children of a device : *---------------------------------------------------------------------------*/ : int32_t int : device_delete_all_children(device_t dev) : { : device_t *devlist; : int32_t devcount; : int32_t error; int devcount, error; : : error = device_get_children(dev, &devlist, &devcount); : if (error == 0) { : : while (devcount-- > 0) { : error = device_delete_child(dev, devlist[devcount]); : if (error) { : break; : } : } : free(devlist, M_TEMP); : } : return error; : } : : This function still uses "device_get_children()", but if it is implemented in : "kern/subr_bus.c", then it can access the child list directly, and we are : saved the memory allocation/deallocation, which is the weak point. : : Also the memory is allocated with M_NOWAIT. Yes. That's a weak point. Warner From owner-p4-projects@FreeBSD.ORG Thu Jan 25 23:26:01 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D31BD16A40F; Thu, 25 Jan 2007 23:26:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9502716A40D for ; Thu, 25 Jan 2007 23:26:00 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 69B5013C4BD for ; Thu, 25 Jan 2007 23:26:00 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0PNQ0oJ070573 for ; Thu, 25 Jan 2007 23:26:00 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0PNPxvN070568 for perforce@freebsd.org; Thu, 25 Jan 2007 23:25:59 GMT (envelope-from cognet@freebsd.org) Date: Thu, 25 Jan 2007 23:25:59 GMT Message-Id: <200701252325.l0PNPxvN070568@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 113536 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2007 23:26:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=113536 Change 113536 by cognet@cognet on 2007/01/25 23:25:10 Bring in cache/MMU Xscale core-3 functions. Affected files ... .. //depot/projects/arm/src/sys/arm/arm/cpufunc_asm_xscale_c3.S#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jan 25 23:28:03 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98D6716A405; Thu, 25 Jan 2007 23:28:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5D0A016A402 for ; Thu, 25 Jan 2007 23:28:03 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4DDD513C465 for ; Thu, 25 Jan 2007 23:28:03 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0PNS3jL070652 for ; Thu, 25 Jan 2007 23:28:03 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0PNS3Rm070649 for perforce@freebsd.org; Thu, 25 Jan 2007 23:28:03 GMT (envelope-from cognet@freebsd.org) Date: Thu, 25 Jan 2007 23:28:03 GMT Message-Id: <200701252328.l0PNS3Rm070649@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 113537 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 25 Jan 2007 23:28:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=113537 Change 113537 by cognet@cognet on 2007/01/25 23:27:09 Bring in that, before I lose it in a hd crash. Basic i8134x support, it doesn't have much more than core and uart support. It needs a lot of work for PCIe and PCI-X support (which requires armv6 supersections support), and SMP (oh mama). mux: coucou Affected files ... .. //depot/projects/arm/src/sys/arm/xscale/i8134x/crb_machdep.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/i8134x/files.crb#1 add .. //depot/projects/arm/src/sys/arm/xscale/i8134x/files.i81342#1 add .. //depot/projects/arm/src/sys/arm/xscale/i8134x/i81342.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/i8134x/i81342reg.h#1 add .. //depot/projects/arm/src/sys/arm/xscale/i8134x/i81342var.h#1 add .. //depot/projects/arm/src/sys/arm/xscale/i8134x/obio_space.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/i8134x/std.crb#1 add .. //depot/projects/arm/src/sys/arm/xscale/i8134x/std.i81342#1 add .. //depot/projects/arm/src/sys/arm/xscale/i8134x/uart_bus_i81342.c#1 add .. //depot/projects/arm/src/sys/arm/xscale/i8134x/uart_cpu_i81342.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jan 26 01:17:20 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C15916A409; Fri, 26 Jan 2007 01:17:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6732616A404 for ; Fri, 26 Jan 2007 01:17:20 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3F81F13C4C9 for ; Fri, 26 Jan 2007 01:17:20 +0000 (UTC) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0Q1HKpv098654 for ; Fri, 26 Jan 2007 01:17:20 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0Q1HKB6098651 for perforce@freebsd.org; Fri, 26 Jan 2007 01:17:20 GMT (envelope-from cognet@freebsd.org) Date: Fri, 26 Jan 2007 01:17:20 GMT Message-Id: <200701260117.l0Q1HKB6098651@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 113539 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Jan 2007 01:17:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=113539 Change 113539 by cognet@cognet on 2007/01/26 01:16:47 Forgot the conf file Affected files ... .. //depot/projects/arm/src/sys/arm/conf/CRB#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Jan 26 04:49:57 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 662E316A400; Fri, 26 Jan 2007 04:49:57 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3D41616A404 for ; Fri, 26 Jan 2007 04:49:57 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2C2D713C48E for ; Fri, 26 Jan 2007 04:49:57 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0Q4nv2s034235 for ; Fri, 26 Jan 2007 04:49:57 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0Q4nuPf034232 for perforce@freebsd.org; Fri, 26 Jan 2007 04:49:56 GMT (envelope-from jkim@freebsd.org) Date: Fri, 26 Jan 2007 04:49:56 GMT Message-Id: <200701260449.l0Q4nuPf034232@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 113545 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Jan 2007 04:49:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=113545 Change 113545 by jkim@jkim_hammer on 2007/01/26 04:49:44 Almost working TLS implementation for AMD64. Simple applications run fine but complex ones may fail. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/amd64/cpu_switch.S#3 edit .. //depot/projects/linuxolator/src/sys/amd64/amd64/genassym.c#5 edit .. //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#12 edit .. //depot/projects/linuxolator/src/sys/amd64/ia32/ia32_signal.c#3 edit .. //depot/projects/linuxolator/src/sys/amd64/include/pcb.h#2 edit .. //depot/projects/linuxolator/src/sys/amd64/include/segments.h#2 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#16 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#28 edit .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysvec.c#7 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/amd64/cpu_switch.S#3 (text+ko) ==== @@ -109,6 +109,7 @@ movl %es,PCB_ES(%r8) movl %fs,PCB_FS(%r8) movl %gs,PCB_GS(%r8) + 1: /* Test if debug registers should be saved. */ testl $PCB_DBREGS,PCB_FLAGS(%r8) @@ -183,22 +184,31 @@ rdmsr movl PCB_GS(%r8),%gs wrmsr + + /* Restore userland 32 bit GS descriptor for Linuxulator */ + movq PCB_GS32P(%r8),%rax + testq %rax,%rax + jz 3f /* no, skip over */ + + movq PCB_GS32SD(%r8),%rcx + movq %rcx,(%rax) jmp 2f + 1: - /* Restore userland %fs */ movl $MSR_FSBASE,%ecx movl PCB_FSBASE(%r8),%eax movl PCB_FSBASE+4(%r8),%edx wrmsr +2: /* Restore userland %gs */ movl $MSR_KGSBASE,%ecx movl PCB_GSBASE(%r8),%eax movl PCB_GSBASE+4(%r8),%edx wrmsr -2: +3: /* Update the TSS_RSP0 pointer for the next interrupt */ movq PCPU(TSSP), %rax addq $COMMON_TSS_RSP0, %rax ==== //depot/projects/linuxolator/src/sys/amd64/amd64/genassym.c#5 (text+ko) ==== @@ -147,6 +147,9 @@ ASSYM(COMMON_TSS_RSP0, offsetof(struct amd64tss, tss_rsp0)); +ASSYM(PCB_GS32P, offsetof(struct pcb, pcb_gs32p)); +ASSYM(PCB_GS32SD, offsetof(struct pcb, pcb_gs32sd)); + ASSYM(TF_R15, offsetof(struct trapframe, tf_r15)); ASSYM(TF_R14, offsetof(struct trapframe, tf_r14)); ASSYM(TF_R13, offsetof(struct trapframe, tf_r13)); ==== //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#12 (text+ko) ==== @@ -156,7 +156,7 @@ extern vm_offset_t ksym_start, ksym_end; #endif -int _udatasel, _ucodesel, _ucode32sel; +int _udatasel, _ucodesel, _ucode32sel, _ugs32sel; int cold = 1; @@ -725,6 +725,15 @@ 0, /* long */ 0, /* default 32 vs 16 bit size */ 0 /* limit granularity (byte/page units)*/ }, +/* GUGS32_SEL 8 32 bit GS Descriptor for user */ +{ 0x0, /* segment base address */ + 0xfffff, /* length - all address space */ + SDT_MEMRWA, /* segment type */ + SEL_UPL, /* segment descriptor priority level */ + 1, /* segment descriptor present */ + 0, /* long */ + 1, /* default 32 vs 16 bit size */ + 1 /* limit granularity (byte/page units)*/ }, }; void @@ -1279,6 +1288,7 @@ _ucodesel = GSEL(GUCODE_SEL, SEL_UPL); _udatasel = GSEL(GUDATA_SEL, SEL_UPL); _ucode32sel = GSEL(GUCODE32_SEL, SEL_UPL); + _ugs32sel = GSEL(GUGS32_SEL, SEL_UPL); /* setup proc 0's pcb */ thread0.td_pcb->pcb_flags = 0; /* XXXKSE */ ==== //depot/projects/linuxolator/src/sys/amd64/ia32/ia32_signal.c#3 (text+ko) ==== @@ -727,6 +727,7 @@ pcb->pcb_es = _udatasel; pcb->pcb_fs = _udatasel; pcb->pcb_gs = _udatasel; + pcb->pcb_gs32p = NULL; bzero((char *)regs, sizeof(struct trapframe)); regs->tf_rip = entry; ==== //depot/projects/linuxolator/src/sys/amd64/include/pcb.h#2 (text+ko) ==== @@ -73,6 +73,9 @@ #define PCB_FULLCTX 0x80 /* full context restore on sysret */ caddr_t pcb_onfault; /* copyin/out fault recovery */ + + caddr_t pcb_gs32p; /* XXX pointer to gdt[GUGS32_SEL] */ + u_int64_t pcb_gs32sd; /* 32 bit GS segment descriptor */ }; #ifdef _KERNEL ==== //depot/projects/linuxolator/src/sys/amd64/include/segments.h#2 (text+ko) ==== @@ -200,9 +200,10 @@ #define GUCODE32_SEL 3 /* User 32 bit code Descriptor */ #define GUDATA_SEL 4 /* User 32/64 bit Data Descriptor */ #define GUCODE_SEL 5 /* User 64 bit Code Descriptor */ -#define GPROC0_SEL 6 /* TSS for entering kernel etc */ +#define GPROC0_SEL 6 /* TSS for entering kernel etc */ /* slot 6 is second half of GPROC0_SEL */ -#define NGDT 8 +#define GUGS32_SEL 8 /* User 32 bit GS Descriptor */ +#define NGDT 9 #ifdef _KERNEL extern struct user_segment_descriptor gdt[]; ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#16 (text+ko) ==== @@ -774,7 +774,6 @@ l_uint limit_in_pages:1; l_uint seg_not_present:1; l_uint useable:1; - l_uint lm:1; }; struct l_desc_struct { @@ -798,7 +797,6 @@ #define ENTRY_B_USEABLE 20 #define ENTRY_B_SEG32BIT 22 #define ENTRY_B_LIMIT 23 -#define ENTRY_B_LONGMODE 21 #define LDT_entry_b(info) \ (((info)->base_addr & 0xff000000) | \ @@ -819,8 +817,7 @@ (info)->read_exec_only == 1 && \ (info)->seg_32bit == 0 && \ (info)->limit_in_pages == 0 && \ - (info)->useable == 0 && \ - (info)->lm == 0) + (info)->useable == 0 ) /* macros for converting segments, they do the same as those in arch/i386/kernel/process.c */ #define GET_BASE(desc) ( \ @@ -838,7 +835,6 @@ #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 GET_LONGMODE(desc) (((desc)->b >> ENTRY_B_LONGMODE) & 1) #define LINUX_CLOCK_REALTIME 0 #define LINUX_CLOCK_MONOTONIC 1 ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#28 (text+ko) ==== @@ -52,6 +52,7 @@ #include #include +#include #include #include @@ -671,7 +672,9 @@ td2->td_frame->tf_rsp = PTROUT(args->stack); if (args->flags & CLONE_SETTLS) { + struct user_segment_descriptor sd; struct l_user_desc info; + int a[2]; int idx; error = copyin((void *)td->td_frame->tf_rsi, &info, sizeof(struct l_user_desc)); @@ -684,26 +687,43 @@ * looks like we're getting the idx we returned * in the set_thread_area() syscall */ - if (idx != 6 && idx != 4) + if (idx != 6 && idx != GUGS32_SEL) return (EINVAL); /* this doesnt happen in practice */ if (idx == 6) { - /* we might copy out the entry_number as 4 */ - info.entry_number = 4; + /* we might copy out the entry_number as GUGS32_SEL */ + info.entry_number = GUGS32_SEL; error = copyout(&info, (void *) td->td_frame->tf_rsi, sizeof(struct l_user_desc)); if (error) return (error); } - /* this is taken from amd64 version of cpu_set_user_tls() */ - critical_enter(); - /* set %gs */ + a[0] = LDT_entry_a(&info); + a[1] = LDT_entry_b(&info); + + memcpy(&sd, &a, sizeof(a)); +#ifdef DEBUG + if (ldebug(clone)) + printf("Segment created in clone with CLONE_SETTLS: " + "lobase: %x, hibase: %x, lolimit: %x, hilimit: %x, " + "type: %i, dpl: %i, p: %i, xx: %i, long: %i, " + "def32: %i, gran: %i\n", + sd.sd_lobase, + sd.sd_hibase, + sd.sd_lolimit, + sd.sd_hilimit, + sd.sd_type, + sd.sd_dpl, + sd.sd_p, + sd.sd_xx, + sd.sd_long, + sd.sd_def32, + sd.sd_gran); +#endif td2->td_pcb->pcb_gsbase = (register_t)info.base_addr; -#if 0 - wrmsr(MSR_KGSBASE, td->td_pcb->pcb_fsbase); -#endif - critical_exit(); + td2->td_pcb->pcb_gs32p = (caddr_t)&gdt[GUGS32_SEL]; + memcpy(&td2->td_pcb->pcb_gs32sd, &sd, sizeof(sd)); } #ifdef DEBUG @@ -1239,6 +1259,8 @@ linux_set_thread_area(struct thread *td, struct linux_set_thread_area_args *args) { struct l_user_desc info; + struct user_segment_descriptor sd; + int a[2]; int error; int idx; @@ -1248,7 +1270,7 @@ #ifdef DEBUG if (ldebug(set_thread_area)) - printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, %i, %i, %i, %i\n"), + printf(ARGS(set_thread_area, "%i, %x, %x, %i, %i, %i, %i, %i, %i"), info.entry_number, info.base_addr, info.limit, @@ -1257,8 +1279,7 @@ info.read_exec_only, info.limit_in_pages, info.seg_not_present, - info.useable, - info.lm); + info.useable); #endif idx = info.entry_number; @@ -1282,25 +1303,54 @@ * we should let 4 proceed as well because we use this segment so * if code does two subsequent calls it should succeed */ - if (idx != 6 && idx != -1 && idx != 4) + if (idx != 6 && idx != -1 && idx != GUGS32_SEL) return (EINVAL); /* * we have to copy out the GDT entry we use - * FreeBSD uses GDT entry #3 for storing %gs so load that + * FreeBSD uses GUGS32_SEL for storing %gs so load that * XXX: what if userspace program doesnt check this value and tries * to use 6, 7 or 8? */ - idx = info.entry_number = 4; + idx = info.entry_number = GUGS32_SEL; error = copyout(&info, args->desc, sizeof(struct l_user_desc)); if (error) return (error); + if (LDT_empty(&info)) { + a[0] = 0; + a[1] = 0; + } else { + a[0] = LDT_entry_a(&info); + a[1] = LDT_entry_b(&info); + } + + memcpy(&sd, &a, sizeof(a)); +#ifdef DEBUG + if (ldebug(set_thread_area)) + printf("Segment created in set_thread_area: " + "lobase: %x, hibase: %x, lolimit: %x, hilimit: %x, " + "type: %i, dpl: %i, p: %i, xx: %i, long: %i, " + "def32: %i, gran: %i\n", + sd.sd_lobase, + sd.sd_hibase, + sd.sd_lolimit, + sd.sd_hilimit, + sd.sd_type, + sd.sd_dpl, + sd.sd_p, + sd.sd_xx, + sd.sd_long, + sd.sd_def32, + sd.sd_gran); +#endif + critical_enter(); - /* set %gs */ td->td_pcb->pcb_gsbase = (register_t)info.base_addr; + td->td_pcb->pcb_gs32p = (caddr_t)&gdt[GUGS32_SEL]; + memcpy(&td->td_pcb->pcb_gs32sd, &sd, sizeof(sd)); wrmsr(MSR_KGSBASE, td->td_pcb->pcb_gsbase); - + gdt[GUGS32_SEL] = sd; critical_exit(); return (0); ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_sysvec.c#7 (text+ko) ==== @@ -280,7 +280,7 @@ return 0; } -extern int _ucodesel, _ucode32sel, _udatasel; +extern int _ucodesel, _ucode32sel, _udatasel, _ugs32sel; extern unsigned long linux_sznonrtsigcode; static void @@ -820,11 +820,12 @@ load_ds(_udatasel); load_es(_udatasel); load_fs(_udatasel); - load_gs(0); + load_gs(_udatasel); pcb->pcb_ds = _udatasel; pcb->pcb_es = _udatasel; pcb->pcb_fs = _udatasel; - pcb->pcb_gs = 0; + pcb->pcb_gs = _udatasel; + pcb->pcb_gs32p = NULL; bzero((char *)regs, sizeof(struct trapframe)); regs->tf_rip = entry; From owner-p4-projects@FreeBSD.ORG Fri Jan 26 05:01:12 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63E2B16A402; Fri, 26 Jan 2007 05:01:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1CE9016A404 for ; Fri, 26 Jan 2007 05:01:12 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E917E13C489 for ; Fri, 26 Jan 2007 05:01:11 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0Q51Bvh035958 for ; Fri, 26 Jan 2007 05:01:11 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0Q51Bp2035953 for perforce@freebsd.org; Fri, 26 Jan 2007 05:01:11 GMT (envelope-from jkim@freebsd.org) Date: Fri, 26 Jan 2007 05:01:11 GMT Message-Id: <200701260501.l0Q51Bp2035953@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 113546 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Jan 2007 05:01:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=113546 Change 113546 by jkim@jkim_hammer on 2007/01/26 05:00:44 Stop mimicking Linux mmap behavior and use Linux/ia64 wisdom. Many Linux/i386 distros have shown different mmap behaviors. Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#29 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#23 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#29 (text+ko) ==== @@ -852,12 +852,14 @@ bsd_args.flags |= MAP_STACK; /* - * Linux has added READ_IMPLIES_EXEC personality but we do not support - * the feature yet. We just assume READ_IMPLIES_EXEC is always on. + * PROT_READ, PROT_WRITE, or PROT_EXEC implies PROT_READ and PROT_EXEC + * on Linux/i386. We do this to ensure maximum compatibility. + * Linux/ia64 does the same in i386 emulation mode. */ bsd_args.prot = linux_args->prot; - if (bsd_args.prot & PROT_READ) - bsd_args.prot |= PROT_EXEC; + if ((bsd_args.prot & PROT_WRITE) || + (bsd_args.prot & (PROT_READ | PROT_EXEC))) + bsd_args.prot |= PROT_READ | PROT_EXEC; if (linux_args->fd != -1) { /* @@ -977,9 +979,9 @@ bsd_args.addr = uap->addr; bsd_args.len = uap->len; bsd_args.prot = uap->prot; - /* XXX PROT_READ implies PROT_EXEC; see linux_mmap_common(). */ - if (bsd_args.prot & PROT_READ) - bsd_args.prot |= PROT_EXEC; + if ((bsd_args.prot & PROT_WRITE) || + (bsd_args.prot & (PROT_READ | PROT_EXEC))) + bsd_args.prot |= PROT_READ | PROT_EXEC; return (mprotect(td, &bsd_args)); } ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#23 (text+ko) ==== @@ -653,12 +653,14 @@ bsd_args.flags |= MAP_STACK; /* - * Linux has added READ_IMPLIES_EXEC personality but we do not support - * the feature yet. We just assume READ_IMPLIES_EXEC is always on. + * PROT_READ, PROT_WRITE, or PROT_EXEC implies PROT_READ and PROT_EXEC + * on Linux/i386. We do this to ensure maximum compatibility. + * Linux/ia64 does the same in i386 emulation mode. */ bsd_args.prot = linux_args->prot; - if (bsd_args.prot & PROT_READ) - bsd_args.prot |= PROT_EXEC; + if ((bsd_args.prot & PROT_WRITE) || + (bsd_args.prot & (PROT_READ | PROT_EXEC))) + bsd_args.prot |= PROT_READ | PROT_EXEC; if (linux_args->fd != -1) { /* @@ -778,9 +780,9 @@ bsd_args.addr = uap->addr; bsd_args.len = uap->len; bsd_args.prot = uap->prot; - /* XXX PROT_READ implies PROT_EXEC; see linux_mmap_common(). */ - if (bsd_args.prot & PROT_READ) - bsd_args.prot |= PROT_EXEC; + if ((bsd_args.prot & PROT_WRITE) || + (bsd_args.prot & (PROT_READ | PROT_EXEC))) + bsd_args.prot |= PROT_READ | PROT_EXEC; return (mprotect(td, &bsd_args)); } From owner-p4-projects@FreeBSD.ORG Fri Jan 26 12:01:19 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 405F016A4D7; Fri, 26 Jan 2007 12:01:19 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D69E116A4D0 for ; Fri, 26 Jan 2007 12:01:18 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BEE0D13C4B9 for ; Fri, 26 Jan 2007 12:01:18 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0QC1Iae011756 for ; Fri, 26 Jan 2007 12:01:18 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0QC1IXw011742 for perforce@freebsd.org; Fri, 26 Jan 2007 12:01:18 GMT (envelope-from zec@FreeBSD.org) Date: Fri, 26 Jan 2007 12:01:18 GMT Message-Id: <200701261201.l0QC1IXw011742@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 113551 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Jan 2007 12:01:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=113551 Change 113551 by zec@zec_tca51 on 2007/01/26 12:00:29 Let gif(4) compile with options VIMAGE. Affected files ... .. //depot/projects/vimage/src/sys/netinet/in_gif.c#2 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#9 edit .. //depot/projects/vimage/src/sys/netinet6/in6_gif.c#3 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/in_gif.c#2 (text+ko) ==== @@ -33,6 +33,7 @@ #include "opt_mrouting.h" #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_vimage.h" #include #include @@ -43,12 +44,13 @@ #include #include #include - #include +#include #include #include +#include #include #include #include @@ -70,6 +72,7 @@ static int gif_validate4(const struct ip *, struct gif_softc *, struct ifnet *); +static void in_gif_init(void); extern struct domain inetdomain; struct protosw in_gif_protosw = { @@ -80,12 +83,23 @@ .pr_input = in_gif_input, .pr_output = (pr_output_t*)rip_output, .pr_ctloutput = rip_ctloutput, + .pr_init = in_gif_init, .pr_usrreqs = &rip_usrreqs }; -static int ip_gif_ttl = GIF_TTL; -SYSCTL_INT(_net_inet_ip, IPCTL_GIF_TTL, gifttl, CTLFLAG_RW, - &ip_gif_ttl, 0, ""); +#ifndef VIMAGE +static int ip_gif_ttl; +#endif +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, IPCTL_GIF_TTL, gifttl, + CTLFLAG_RW, ip_gif_ttl, 0, ""); + +static void +in_gif_init(void) +{ + INIT_VNET_INET(curvnetb); + + V_ip_gif_ttl = GIF_TTL; +} int in_gif_output(ifp, family, m) @@ -93,6 +107,7 @@ int family; struct mbuf *m; { + INIT_VNET_INET(ifp->if_vnetb); struct gif_softc *sc = ifp->if_softc; struct sockaddr_in *dst = (struct sockaddr_in *)&sc->gif_ro.ro_dst; struct sockaddr_in *sin_src = (struct sockaddr_in *)sc->gif_psrc; @@ -177,7 +192,7 @@ } iphdr.ip_p = proto; /* version will be set in ip_output() */ - iphdr.ip_ttl = ip_gif_ttl; + iphdr.ip_ttl = V_ip_gif_ttl; iphdr.ip_len = m->m_pkthdr.len + sizeof(struct ip); ip_ecn_ingress((ifp->if_flags & IFF_LINK1) ? ECN_ALLOWED : ECN_NOCARE, &iphdr.ip_tos, &tos); @@ -242,6 +257,7 @@ struct mbuf *m; int off; { + INIT_VNET_INET(curvnetb); struct ifnet *gifp = NULL; struct gif_softc *sc; struct ip *ip; @@ -255,14 +271,14 @@ sc = (struct gif_softc *)encap_getarg(m); if (sc == NULL) { m_freem(m); - ipstat.ips_nogif++; + V_ipstat.ips_nogif++; return; } gifp = GIF2IFP(sc); if (gifp == NULL || (gifp->if_flags & IFF_UP) == 0) { m_freem(m); - ipstat.ips_nogif++; + V_ipstat.ips_nogif++; return; } @@ -322,7 +338,7 @@ break; default: - ipstat.ips_nogif++; + V_ipstat.ips_nogif++; m_freem(m); return; } @@ -339,6 +355,7 @@ struct gif_softc *sc; struct ifnet *ifp; { + INIT_VNET_INET(curvnetb); struct sockaddr_in *src, *dst; struct in_ifaddr *ia4; @@ -358,7 +375,7 @@ return 0; } /* reject packets with broadcast on source */ - TAILQ_FOREACH(ia4, &in_ifaddrhead, ia_link) { + TAILQ_FOREACH(ia4, &V_in_ifaddrhead, ia_link) { if ((ia4->ia_ifa.ifa_ifp->if_flags & IFF_BROADCAST) == 0) continue; if (ip->ip_src.s_addr == ia4->ia_broadaddr.sin_addr.s_addr) ==== //depot/projects/vimage/src/sys/netinet/vinet.h#9 (text+ko) ==== @@ -104,6 +104,8 @@ int _rtq_timeout; struct callout _rtq_timer; + + int _ip_gif_ttl; }; extern struct vnet_inet vnet_inet_0; @@ -167,4 +169,6 @@ #define V_rtq_timeout VNET_INET(rtq_timeout) #define V_rtq_timer VNET_INET(rtq_timer) +#define V_ip_gif_ttl VNET_INET(ip_gif_ttl) + #endif /* !_NETINET_VINET_H_ */ ==== //depot/projects/vimage/src/sys/netinet6/in6_gif.c#3 (text+ko) ==== @@ -32,6 +32,7 @@ #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_vimage.h" #include #include @@ -42,8 +43,8 @@ #include #include #include - #include +#include #include #include @@ -55,6 +56,7 @@ #endif #include #ifdef INET6 +#include #include #include #include @@ -247,6 +249,7 @@ struct mbuf **mp; int *offp, proto; { + INIT_VNET_INET6(curvnetb); struct mbuf *m = *mp; struct ifnet *gifp = NULL; struct gif_softc *sc; @@ -259,14 +262,14 @@ sc = (struct gif_softc *)encap_getarg(m); if (sc == NULL) { m_freem(m); - ip6stat.ip6s_nogif++; + V_ip6stat.ip6s_nogif++; return IPPROTO_DONE; } gifp = GIF2IFP(sc); if (gifp == NULL || (gifp->if_flags & IFF_UP) == 0) { m_freem(m); - ip6stat.ip6s_nogif++; + V_ip6stat.ip6s_nogif++; return IPPROTO_DONE; } @@ -321,7 +324,7 @@ break; default: - ip6stat.ip6s_nogif++; + V_ip6stat.ip6s_nogif++; m_freem(m); return IPPROTO_DONE; } From owner-p4-projects@FreeBSD.ORG Fri Jan 26 12:07:27 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D39816A404; Fri, 26 Jan 2007 12:07:27 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EBAA516A402 for ; Fri, 26 Jan 2007 12:07:26 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C83DF13C48D for ; Fri, 26 Jan 2007 12:07:26 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0QC7QeE014870 for ; Fri, 26 Jan 2007 12:07:26 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0QC7Qwx014867 for perforce@freebsd.org; Fri, 26 Jan 2007 12:07:26 GMT (envelope-from zec@FreeBSD.org) Date: Fri, 26 Jan 2007 12:07:26 GMT Message-Id: <200701261207.l0QC7Qwx014867@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 113552 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Jan 2007 12:07:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=113552 Change 113552 by zec@zec_tca51 on 2007/01/26 12:06:57 The GENERIC kernel config + options VIMAGE now compiles fine (at least on i386 systems), hence remove "nodevice gif" line from the VIMAGE config. Affected files ... .. //depot/projects/vimage/src/sys/i386/conf/VIMAGE#7 edit Differences ... ==== //depot/projects/vimage/src/sys/i386/conf/VIMAGE#7 (text+ko) ==== @@ -13,5 +13,3 @@ # Some kernel subsystems and functions don't yet compile with VIMAGE. Remove # from the configuration for now. # - -nodevice gif From owner-p4-projects@FreeBSD.ORG Fri Jan 26 12:59:33 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADD6B16A404; Fri, 26 Jan 2007 12:59:33 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 87F4916A401 for ; Fri, 26 Jan 2007 12:59:33 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7C25313C489 for ; Fri, 26 Jan 2007 12:59:33 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0QCxXZc032377 for ; Fri, 26 Jan 2007 12:59:33 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0QCxXv8032374 for perforce@freebsd.org; Fri, 26 Jan 2007 12:59:33 GMT (envelope-from sephe@FreeBSD.org) Date: Fri, 26 Jan 2007 12:59:33 GMT Message-Id: <200701261259.l0QCxXv8032374@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 113556 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Jan 2007 12:59:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=113556 Change 113556 by sephe@sephe_zealot:sam_wifi on 2007/01/26 12:59:27 - For ath(4), map HAL's CHANNEL_PUREG to IEEE80211_CHAN_G, since except for AR5211 part, HAL's CHANNEL_PUREG means mixed DSSS and OFDM. Explained-and-OKed-by: sam@ - After above change, all device's 11g channel flags are IEEE80211_CHAN_G, replace IEEE80211_CHAN_PUREG with IEEE80211_CHAN_G for IEEE80211_MODE_11G. Above two changes make scanning work on both ath(4) and other 802.11 devices, if desired 'mode' is set to 11g. Before this commit only ath(4) works, mainly because ath(4)'s 11g channel flags are IEEE80211_CHAN_PUREG while other 802.11 devices's 11g channel flags are IEEE80211_CHAN_G. - In ieee80211_scan_sta.c:add_channels(), move scan list limit check to the beginning of the loop, so channel searching will not be performed if scan list limit is reached. - Reorganize bottom half of ieee80211_scan_sta.c:sta_start(), o Add scan list limit checking. o Call checktable(), no matter whether desired 'mode' is auto or not, so already added channels will not be added to scan list again if desired 'mode' is not auto. Tested-with: ath(4) (mac 7.{8,9} phy 4.5 radio 5.6) ral(4) (2560 and 2661 parts) Reviewed-by: sam@ Approved-by: sam@ Affected files ... .. //depot/projects/wifi/sys/dev/ath/if_ath.c#130 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#65 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan_ap.c#4 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#11 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#130 (text+ko) ==== @@ -5489,7 +5489,17 @@ if_printf(ifp, "hal channel %u/%x -> %u\n", c->channel, c->channelFlags, ichan->ic_ieee); ichan->ic_freq = c->channel; - ichan->ic_flags = c->channelFlags; + + if (c->channelFlags == CHANNEL_PUREG) { + /* + * Except for AR5211, HAL's PUREG means mixed + * DSSS and OFDM. + */ + ichan->ic_flags = IEEE80211_CHAN_G; + } else { + ichan->ic_flags = c->channelFlags; + } + if (ath_hal_isgsmsku(ah)) { /* remap to true frequencies */ ichan->ic_freq = 922 + (2422 - ichan->ic_freq); ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#65 (text+ko) ==== @@ -1629,7 +1629,7 @@ 0, /* IEEE80211_MODE_AUTO */ IEEE80211_CHAN_A, /* IEEE80211_MODE_11A */ IEEE80211_CHAN_B, /* IEEE80211_MODE_11B */ - IEEE80211_CHAN_PUREG, /* IEEE80211_MODE_11G */ + IEEE80211_CHAN_G, /* IEEE80211_MODE_11G */ IEEE80211_CHAN_FHSS, /* IEEE80211_MODE_FH */ IEEE80211_CHAN_108A, /* IEEE80211_MODE_TURBO_A */ IEEE80211_CHAN_108G, /* IEEE80211_MODE_TURBO_G */ ==== //depot/projects/wifi/sys/net80211/ieee80211_scan_ap.c#4 (text+ko) ==== @@ -167,7 +167,7 @@ 0, /* IEEE80211_MODE_AUTO */ IEEE80211_CHAN_A, /* IEEE80211_MODE_11A */ IEEE80211_CHAN_B, /* IEEE80211_MODE_11B */ - IEEE80211_CHAN_PUREG, /* IEEE80211_MODE_11G */ + IEEE80211_CHAN_G, /* IEEE80211_MODE_11G */ IEEE80211_CHAN_FHSS, /* IEEE80211_MODE_FH */ IEEE80211_CHAN_108A, /* IEEE80211_MODE_TURBO_A */ IEEE80211_CHAN_108G, /* IEEE80211_MODE_TURBO_G */ ==== //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#11 (text+ko) ==== @@ -341,10 +341,10 @@ IEEE80211_CHAN_B, /* IEEE80211_MODE_AUTO */ IEEE80211_CHAN_A, /* IEEE80211_MODE_11A */ IEEE80211_CHAN_B, /* IEEE80211_MODE_11B */ - IEEE80211_CHAN_PUREG, /* IEEE80211_MODE_11G */ + IEEE80211_CHAN_G, /* IEEE80211_MODE_11G */ IEEE80211_CHAN_FHSS, /* IEEE80211_MODE_FH */ IEEE80211_CHAN_A, /* IEEE80211_MODE_TURBO_A */ /* for turbo mode look for AP in normal channel */ - IEEE80211_CHAN_PUREG, /* IEEE80211_MODE_TURBO_G */ + IEEE80211_CHAN_G, /* IEEE80211_MODE_TURBO_G */ IEEE80211_CHAN_ST, /* IEEE80211_MODE_STURBO_A */ }; @@ -361,6 +361,9 @@ KASSERT(mode < N(chanflags), ("Unexpected mode %u", mode)); modeflags = chanflags[mode]; for (i = 0; i < nfreq; i++) { + if (ss->ss_last >= IEEE80211_SCAN_MAX) + break; + c = ieee80211_find_channel(ic, freq[i], modeflags); if (c == NULL || isexcluded(ic, c)) continue; @@ -373,8 +376,6 @@ (cg = find11gchannel(ic, i, c->ic_freq)) != NULL) c = cg; } - if (ss->ss_last >= IEEE80211_SCAN_MAX) - break; ss->ss_chans[ss->ss_last++] = c; } #undef N @@ -466,7 +467,7 @@ enum ieee80211_phymode mode; struct ieee80211_channel *c; int i; - + ss->ss_last = 0; /* * Use the table of ordered channels to construct the list @@ -519,6 +520,9 @@ * in the staScanTable. */ for (i = 0; i < ic->ic_nchans; i++) { + if (ss->ss_last >= IEEE80211_SCAN_MAX) + break; + c = &ic->ic_channels[i]; /* * Ignore dynamic turbo channels; we scan them @@ -526,29 +530,32 @@ */ if (IEEE80211_IS_CHAN_DTURBO(c)) continue; + /* + * If a desired mode was specified, scan only + * channels that satisfy that constraint. + */ + if (ic->ic_des_mode != IEEE80211_MODE_AUTO && + ic->ic_des_mode != ieee80211_chan2mode(c)) + continue; + + /* * Skip channels excluded by user request. */ if (isexcluded(ic, c)) continue; - mode = ieee80211_chan2mode(c); - if (ic->ic_des_mode != IEEE80211_MODE_AUTO) { - /* - * If a desired mode was specified, scan only - * channels that satisfy that constraint. - */ - if (ic->ic_des_mode == mode) - ss->ss_chans[ss->ss_last++] = c; - } else { - /* - * Add the channel unless it is listed in the - * fixed scan order tables. This insures we - * don't sweep back in channels we filtered out - * above. - */ - if (!checktable(staScanTable, c)) - ss->ss_chans[ss->ss_last++] = c; - } + + /* + * Add the channel unless it is listed in the + * fixed scan order tables. This insures we + * don't sweep back in channels we filtered out + * above. + */ + if (checktable(staScanTable, c)) + continue; + + /* Add channel to scanning list. */ + ss->ss_chans[ss->ss_last++] = c; } ss->ss_next = 0; From owner-p4-projects@FreeBSD.ORG Fri Jan 26 13:48:36 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A10516A405; Fri, 26 Jan 2007 13:48:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1AD2C16A400 for ; Fri, 26 Jan 2007 13:48:36 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0D1C213C46E for ; Fri, 26 Jan 2007 13:48:36 +0000 (UTC) (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 l0QDmZn5041493 for ; Fri, 26 Jan 2007 13:48:35 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0QDmZCk041490 for perforce@freebsd.org; Fri, 26 Jan 2007 13:48:35 GMT (envelope-from bushman@freebsd.org) Date: Fri, 26 Jan 2007 13:48:35 GMT Message-Id: <200701261348.l0QDmZCk041490@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 113557 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Jan 2007 13:48:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=113557 Change 113557 by bushman@bushman_nss_ldap_cached on 2007/01/26 13:48:26 A lot of unused variable/missing include fixes. LDAP_DEPRECATED is now set in Makefile. Pthread functions names are now used without any underscores. According to the libc naming scheme, it is the most correct way to use them in separate nsswitch module. Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/Makefile#12 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_group.c#17 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_passwd.c#18 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_serv.c#14 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.c#18 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.c#15 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapschema.c#15 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapsearch.c#18 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaptls.c#10 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaptls.h#9 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaputil.c#17 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.c#20 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.h#15 edit .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/Makefile#3 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/Makefile#12 (text+ko) ==== @@ -10,8 +10,12 @@ 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+= -DLDAP_DEPRECATED +LDADD+= -lldap + +.if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DINET6 -LDADD+= -lldap +.endif .if ${MK_OPENSSL} != "no" CFLAGS+= -DNSS_LDAP_START_TLS_ENABLED -DNSS_LDAP_SSL_ENABLED ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_group.c#17 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include #include +#include #include "hashtable.h" #include "ldapconn.h" #include "ldapschema.h" @@ -188,7 +189,6 @@ struct mapped_user new_mu; struct nss_ldap_search_context *newctx; struct map_group_dn_request *req; - char **cp; char const *uid_attr, *gid_attr; struct processed_group *group_hash_entry_data; struct __pg_he *group_hash_entry; ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_passwd.c#18 (text+ko) ==== @@ -28,13 +28,15 @@ #include __FBSDID("$FreeBSD$"); +#include #include #include #include #include #include #include - +#include +#include #include "ldapconn.h" #include "ldapschema.h" #include "ldapsearch.h" ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_serv.c#14 (text+ko) ==== @@ -28,12 +28,14 @@ #include __FBSDID("$FreeBSD$"); +#include #include #include #include #include #include #include +#include #include "ldapconn.h" #include "ldapschema.h" #include "ldapsearch.h" @@ -140,7 +142,6 @@ (void *)&mdata, buffer, bufsize, nss_ldap_parse_servent, NULL); - printf("== %d\n", rv); if (rv == NS_SUCCESS) *result = serv; @@ -193,7 +194,7 @@ struct services_mdata_ext *serv_mdata_ext; struct servent *serv; - char *buf, **values; + char *buf; size_t buflen; size_t len, memlen; int rv; ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.c#18 (text+ko) ==== @@ -760,9 +760,8 @@ { FILE *fin; char buffer[1024]; - char *fields[16], *str; - int field_count, line_num, value; - int i, res, rv; + char *fields[16]; + int field_count, line_num, res; assert(conf != NULL); assert(fname != NULL); @@ -870,7 +869,7 @@ #endif } else { snprintf(err->buffer, sizeof(err->buffer), "parse error in " - "configuration file '%s'", fname, line_num); + "configuration file '%s', line %d", fname, line_num); err->line = line_num; } ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.c#15 (text+ko) ==== @@ -35,9 +35,11 @@ #include #include #include +#include #include #include #include +#include #include "ldapschema.h" #include "ldapsearch.h" #include "ldaptls.h" @@ -309,6 +311,7 @@ assert(conn != NULL); memset(conn, 0, sizeof(struct nss_ldap_connection)); + return (0); } ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapschema.c#15 (text+ko) ==== @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -301,7 +302,6 @@ struct nss_ldap_schema_rule *rule) { struct nss_ldap_schema_rule *new_coll; - size_t new_eff_size; assert(rules != NULL); assert(rule != NULL); ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapsearch.c#18 (text+ko) ==== @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -41,6 +42,7 @@ #include "ldapsearch.h" #include "ldaptls.h" #include "ldapconf.h" +#include "ldaputil.h" #include "nss_ldap.h" static int copy_request(struct nss_ldap_search_request *, @@ -263,7 +265,7 @@ BerElement *cookie; char **res_arr, **new_res_arr; char *sbuf, *rbuf; - size_t res_arr_size, res_buf_size, res_buf_offset, res_arr_offset; + size_t res_arr_size, res_buf_offset, res_arr_offset; int range_start, range_end, rv, sf; rv = __nss_ldap_parse_range(attr, &range_start, &range_end); @@ -487,7 +489,7 @@ { LDAPControl **server_controls; char *matcheddn, *errmsg, **referrals; - int errcode, finished, rv; + int errcode, rv; unsigned long abs_rescount; assert(ctx != NULL); @@ -623,17 +625,6 @@ free(ctx); } -static void -end_parsing_def(struct nss_ldap_parse_context *pctx) -{ - - assert(pctx != NULL); - - if (pctx->parse_destroy_fn != NULL) - pctx->parse_destroy_fn(pctx); - free(pctx); -} - struct nss_ldap_search_context * __nss_ldap_start_search(struct nss_ldap_search_method *method, struct nss_ldap_connection *conn, @@ -809,7 +800,6 @@ struct nss_ldap_schema *schema; struct nss_ldap_schema_rule *rule; char **values; - size_t size; int rv; assert(ctx != NULL); ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaptls.c#10 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaptls.h#9 (text+ko) ==== @@ -47,7 +47,7 @@ static void \ name##_keyinit(void) \ { \ - (void)_pthread_key_create(&name##_state_key, name##_endstate); \ + (void)pthread_key_create(&name##_state_key, name##_endstate); \ } \ \ static int \ @@ -56,7 +56,7 @@ static pthread_once_t keyinit = PTHREAD_ONCE_INIT; \ int rv; \ \ - if (!__isthreaded || _pthread_main_np() != 0) { \ + if (!__isthreaded || pthread_main_np() != 0) { \ if (name##_st == NULL) { \ name##_st = (struct name##_state *)malloc( \ sizeof(struct name##_state)); \ @@ -68,16 +68,16 @@ *p = name##_st; \ return (0); \ } \ - rv = _pthread_once(&keyinit, name##_keyinit); \ + rv = pthread_once(&keyinit, name##_keyinit); \ if (rv != 0) \ return (rv); \ - *p = (struct name##_state *)_pthread_getspecific(name##_state_key);\ + *p = (struct name##_state *)pthread_getspecific(name##_state_key);\ if (*p != NULL) \ return (0); \ *p = calloc(1, sizeof(**p)); \ if (*p == NULL) \ return (ENOMEM); \ - rv = _pthread_setspecific(name##_state_key, *p); \ + rv = pthread_setspecific(name##_state_key, *p); \ if (rv != 0) { \ free(*p); \ *p = NULL; \ ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldaputil.c#17 (text+ko) ==== @@ -33,6 +33,9 @@ #include #include #include +#include +#include +#include #include #include #include "ldaputil.h" @@ -233,7 +236,6 @@ break; }; -fin: va_end(ap); switch (rv) { ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.c#20 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include "ldapschema.h" #include "ldapconn.h" #include "ldaputil.h" @@ -135,7 +136,7 @@ struct nss_ldap_tls_method *, int, char const *, struct nss_ldap_parse_context **, struct nss_ldap_connection *, struct nss_ldap_parse_context *); -static int nss_ldap_parse_context_done(struct nss_ldap_search_method *, +static void nss_ldap_parse_context_done(struct nss_ldap_search_method *, struct nss_ldap_tls_method *, struct nss_ldap_parse_context *, int); @@ -246,7 +247,6 @@ connection_destroy_func(struct nss_ldap_connection *conn) { struct nss_ldap_connection_error conn_error; - int rv; memset(&conn_error, 0, sizeof(conn_error)); (void)__nss_ldap_disconnect(&__nss_ldap_conf->connection_method, @@ -605,7 +605,7 @@ return (rv); } -static int +static void nss_ldap_parse_context_done(struct nss_ldap_search_method *search_method, struct nss_ldap_tls_method *tls_method, struct nss_ldap_parse_context *pctx, int map_id) @@ -956,7 +956,7 @@ pthread_rwlock_unlock(&nss_ldap_lock); } -int +void __nss_ldap_log(int level, char const *fmt, ...) { char error_buf[1024]; @@ -991,8 +991,6 @@ _ldap_nss_module_register(const char *source, unsigned int *mtabsize, nss_module_unregister_fn *unreg) { - int rv; - __nss_ldap_log(NSS_LDAP_LL_DEBUG_INT, "_nss_ldap_nss_module_register called"); ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.h#15 (text+ko) ==== @@ -63,7 +63,7 @@ nss_ldap_parse_next_fn, nss_ldap_parse_destroy_fn); extern int __nss_ldap_getent(int, char const *, void *, char *, size_t, nss_ldap_parse_next_fn, nss_ldap_parse_destroy_fn); -extern int __nss_ldap_log(int level, char const *fmt, ...); +extern void __nss_ldap_log(int level, char const *fmt, ...); extern void __nss_ldap_setent(int); #endif ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/Makefile#3 (text+ko) ==== @@ -2,17 +2,15 @@ .include -LIB= nss_ldap_bsd SHLIB_MAJOR= 1 SHLIB_NAME= nss_ldap_bsd.so.${SHLIB_MAJOR} SHLIBDIR?= ${PREFIX}/lib -LIBDIR= ${PREFIX}/lib MANDIR?= ${PREFIX}/man/man 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+=-DINET6 -I${PREFIX]/include\ +CFLAGS+=-DINET6 -I${PREFIX}/include\ -DNSS_LDAP_CONF_PATH=\"${PREFIX}/etc/nss_ldap.conf\" LDFLAGS+= -L${PREFIX}/lib LDADD+= -lldap From owner-p4-projects@FreeBSD.ORG Fri Jan 26 13:50:39 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91FC216A403; Fri, 26 Jan 2007 13:50:39 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5221216A402 for ; Fri, 26 Jan 2007 13:50:39 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4570F13C487 for ; Fri, 26 Jan 2007 13:50:39 +0000 (UTC) (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 l0QDod6J041661 for ; Fri, 26 Jan 2007 13:50:39 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0QDockE041658 for perforce@freebsd.org; Fri, 26 Jan 2007 13:50:38 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 26 Jan 2007 13:50:38 GMT Message-Id: <200701261350.l0QDockE041658@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 113559 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Jan 2007 13:50:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=113559 Change 113559 by hselasky@hselasky_mini_itx on 2007/01/26 13:50:34 Store the completion time in milliseconds for isochronous transfer. This information can be useful to echo-cancellers and the alike. Correct a comment. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci.c#22 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.c#19 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#31 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#22 (text+ko) ==== @@ -2470,6 +2470,8 @@ DPRINTFN(2,("start next=%d\n", xfer->pipe->isoc_next)); } + xfer->isoc_complete_time = (xfer->pipe->isoc_next + xfer->nframes) % USBD_ISOC_TIME_MAX; + nframes = xfer->nframes; if(nframes == 0) @@ -2703,6 +2705,8 @@ DPRINTFN(2,("start next=%d\n", xfer->pipe->isoc_next)); } + xfer->isoc_complete_time = (xfer->pipe->isoc_next + xfer->nframes) % USBD_ISOC_TIME_MAX; + nframes = xfer->nframes; if(nframes == 0) ==== //depot/projects/usb/src/sys/dev/usb/ohci.c#18 (text+ko) ==== @@ -1905,6 +1905,8 @@ DPRINTFN(2,("start next=%d\n", xfer->pipe->isoc_next)); } + xfer->isoc_complete_time = (xfer->pipe->isoc_next + xfer->nframes) % USBD_ISOC_TIME_MAX; + nframes = xfer->nframes; if(nframes == 0) ==== //depot/projects/usb/src/sys/dev/usb/uhci.c#19 (text+ko) ==== @@ -2010,6 +2010,8 @@ DPRINTFN(2,("start next=%d\n", xfer->pipe->isoc_next)); } + xfer->isoc_complete_time = (xfer->pipe->isoc_next + xfer->nframes) % USBD_ISOC_TIME_MAX; + nframes = xfer->nframes; if(nframes == 0) ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#31 (text+ko) ==== @@ -362,6 +362,9 @@ uint16_t max_frame_size; uint16_t qh_pos; +#define USBD_ISOC_TIME_MAX 128 /* ms */ + + uint8_t isoc_complete_time; /* in ms */ uint8_t address; uint8_t endpoint; uint8_t interval; /* milliseconds */ @@ -791,7 +794,7 @@ #define USB_CDEV_FLAG_FWD_SHORT 0x00040000 /* can be set to forward short transfers */ #define USB_CDEV_FLAG_READ_ONLY 0x00080000 /* device is read only */ -#define USB_CDEV_FLAG_WRITE_ONLY 0x00100000 /* device is read only */ +#define USB_CDEV_FLAG_WRITE_ONLY 0x00100000 /* device is write only */ #define USB_CDEV_FLAG_WAKEUP_RD_IMMED 0x00200000 /* wakeup read thread immediately */ #define USB_CDEV_FLAG_WAKEUP_WR_IMMED 0x00400000 /* wakeup write thread immediately */ From owner-p4-projects@FreeBSD.ORG Fri Jan 26 13:50:40 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 217F316A515; Fri, 26 Jan 2007 13:50:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DB74A16A511 for ; Fri, 26 Jan 2007 13:50:39 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CB3BF13C48C for ; Fri, 26 Jan 2007 13:50:39 +0000 (UTC) (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 l0QDod37041668 for ; Fri, 26 Jan 2007 13:50:39 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0QDodvZ041664 for perforce@freebsd.org; Fri, 26 Jan 2007 13:50:39 GMT (envelope-from bushman@freebsd.org) Date: Fri, 26 Jan 2007 13:50:39 GMT Message-Id: <200701261350.l0QDodvZ041664@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 113560 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Jan 2007 13:50:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=113560 Change 113560 by bushman@bushman_nss_ldap_cached on 2007/01/26 13:50:34 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/Makefile#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldap_group.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldap_passwd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldap_serv.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapconf.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapconn.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapschema.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapsearch.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldaptls.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldaptls.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldaputil.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/nss_ldap.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/nss_ldap.h#2 integrate Differences ... ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/Makefile#4 (text+ko) ==== @@ -10,10 +10,14 @@ 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+= -DLDAP_DEPRECATED +LDADD+= -lldap + +.if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DINET6 -I${PREFIX}/include\ -DNSS_LDAP_CONF_PATH=\"${PREFIX}/etc/nss_ldap.conf\" LDFLAGS+= -L${PREFIX}/lib -LDADD+= -lldap +.endif CFLAGS+= -DNSS_LDAP_START_TLS_ENABLED -DNSS_LDAP_SSL_ENABLED ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldap_group.c#2 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include #include +#include #include "hashtable.h" #include "ldapconn.h" #include "ldapschema.h" @@ -188,7 +189,6 @@ struct mapped_user new_mu; struct nss_ldap_search_context *newctx; struct map_group_dn_request *req; - char **cp; char const *uid_attr, *gid_attr; struct processed_group *group_hash_entry_data; struct __pg_he *group_hash_entry; ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldap_passwd.c#2 (text+ko) ==== @@ -28,13 +28,15 @@ #include __FBSDID("$FreeBSD$"); +#include #include #include #include #include #include #include - +#include +#include #include "ldapconn.h" #include "ldapschema.h" #include "ldapsearch.h" ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldap_serv.c#2 (text+ko) ==== @@ -28,12 +28,14 @@ #include __FBSDID("$FreeBSD$"); +#include #include #include #include #include #include #include +#include #include "ldapconn.h" #include "ldapschema.h" #include "ldapsearch.h" @@ -140,7 +142,6 @@ (void *)&mdata, buffer, bufsize, nss_ldap_parse_servent, NULL); - printf("== %d\n", rv); if (rv == NS_SUCCESS) *result = serv; @@ -193,7 +194,7 @@ struct services_mdata_ext *serv_mdata_ext; struct servent *serv; - char *buf, **values; + char *buf; size_t buflen; size_t len, memlen; int rv; ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapconf.c#2 (text+ko) ==== @@ -760,9 +760,8 @@ { FILE *fin; char buffer[1024]; - char *fields[16], *str; - int field_count, line_num, value; - int i, res, rv; + char *fields[16]; + int field_count, line_num, res; assert(conf != NULL); assert(fname != NULL); @@ -870,7 +869,7 @@ #endif } else { snprintf(err->buffer, sizeof(err->buffer), "parse error in " - "configuration file '%s'", fname, line_num); + "configuration file '%s', line %d", fname, line_num); err->line = line_num; } ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapconn.c#2 (text+ko) ==== @@ -35,9 +35,11 @@ #include #include #include +#include #include #include #include +#include #include "ldapschema.h" #include "ldapsearch.h" #include "ldaptls.h" @@ -309,6 +311,7 @@ assert(conn != NULL); memset(conn, 0, sizeof(struct nss_ldap_connection)); + return (0); } ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapschema.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -301,7 +302,6 @@ struct nss_ldap_schema_rule *rule) { struct nss_ldap_schema_rule *new_coll; - size_t new_eff_size; assert(rules != NULL); assert(rule != NULL); ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldapsearch.c#2 (text+ko) ==== @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -41,6 +42,7 @@ #include "ldapsearch.h" #include "ldaptls.h" #include "ldapconf.h" +#include "ldaputil.h" #include "nss_ldap.h" static int copy_request(struct nss_ldap_search_request *, @@ -263,7 +265,7 @@ BerElement *cookie; char **res_arr, **new_res_arr; char *sbuf, *rbuf; - size_t res_arr_size, res_buf_size, res_buf_offset, res_arr_offset; + size_t res_arr_size, res_buf_offset, res_arr_offset; int range_start, range_end, rv, sf; rv = __nss_ldap_parse_range(attr, &range_start, &range_end); @@ -487,7 +489,7 @@ { LDAPControl **server_controls; char *matcheddn, *errmsg, **referrals; - int errcode, finished, rv; + int errcode, rv; unsigned long abs_rescount; assert(ctx != NULL); @@ -623,17 +625,6 @@ free(ctx); } -static void -end_parsing_def(struct nss_ldap_parse_context *pctx) -{ - - assert(pctx != NULL); - - if (pctx->parse_destroy_fn != NULL) - pctx->parse_destroy_fn(pctx); - free(pctx); -} - struct nss_ldap_search_context * __nss_ldap_start_search(struct nss_ldap_search_method *method, struct nss_ldap_connection *conn, @@ -809,7 +800,6 @@ struct nss_ldap_schema *schema; struct nss_ldap_schema_rule *rule; char **values; - size_t size; int rv; assert(ctx != NULL); ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldaptls.c#2 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldaptls.h#2 (text+ko) ==== @@ -47,7 +47,7 @@ static void \ name##_keyinit(void) \ { \ - (void)_pthread_key_create(&name##_state_key, name##_endstate); \ + (void)pthread_key_create(&name##_state_key, name##_endstate); \ } \ \ static int \ @@ -56,7 +56,7 @@ static pthread_once_t keyinit = PTHREAD_ONCE_INIT; \ int rv; \ \ - if (!__isthreaded || _pthread_main_np() != 0) { \ + if (!__isthreaded || pthread_main_np() != 0) { \ if (name##_st == NULL) { \ name##_st = (struct name##_state *)malloc( \ sizeof(struct name##_state)); \ @@ -68,16 +68,16 @@ *p = name##_st; \ return (0); \ } \ - rv = _pthread_once(&keyinit, name##_keyinit); \ + rv = pthread_once(&keyinit, name##_keyinit); \ if (rv != 0) \ return (rv); \ - *p = (struct name##_state *)_pthread_getspecific(name##_state_key);\ + *p = (struct name##_state *)pthread_getspecific(name##_state_key);\ if (*p != NULL) \ return (0); \ *p = calloc(1, sizeof(**p)); \ if (*p == NULL) \ return (ENOMEM); \ - rv = _pthread_setspecific(name##_state_key, *p); \ + rv = pthread_setspecific(name##_state_key, *p); \ if (rv != 0) { \ free(*p); \ *p = NULL; \ ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/ldaputil.c#2 (text+ko) ==== @@ -33,6 +33,9 @@ #include #include #include +#include +#include +#include #include #include #include "ldaputil.h" @@ -233,7 +236,6 @@ break; }; -fin: va_end(ap); switch (rv) { ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/nss_ldap.c#2 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include "ldapschema.h" #include "ldapconn.h" #include "ldaputil.h" @@ -135,7 +136,7 @@ struct nss_ldap_tls_method *, int, char const *, struct nss_ldap_parse_context **, struct nss_ldap_connection *, struct nss_ldap_parse_context *); -static int nss_ldap_parse_context_done(struct nss_ldap_search_method *, +static void nss_ldap_parse_context_done(struct nss_ldap_search_method *, struct nss_ldap_tls_method *, struct nss_ldap_parse_context *, int); @@ -246,7 +247,6 @@ connection_destroy_func(struct nss_ldap_connection *conn) { struct nss_ldap_connection_error conn_error; - int rv; memset(&conn_error, 0, sizeof(conn_error)); (void)__nss_ldap_disconnect(&__nss_ldap_conf->connection_method, @@ -605,7 +605,7 @@ return (rv); } -static int +static void nss_ldap_parse_context_done(struct nss_ldap_search_method *search_method, struct nss_ldap_tls_method *tls_method, struct nss_ldap_parse_context *pctx, int map_id) @@ -956,7 +956,7 @@ pthread_rwlock_unlock(&nss_ldap_lock); } -int +void __nss_ldap_log(int level, char const *fmt, ...) { char error_buf[1024]; @@ -991,8 +991,6 @@ _ldap_nss_module_register(const char *source, unsigned int *mtabsize, nss_module_unregister_fn *unreg) { - int rv; - __nss_ldap_log(NSS_LDAP_LL_DEBUG_INT, "_nss_ldap_nss_module_register called"); ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/nss_ldap.h#2 (text+ko) ==== @@ -63,7 +63,7 @@ nss_ldap_parse_next_fn, nss_ldap_parse_destroy_fn); extern int __nss_ldap_getent(int, char const *, void *, char *, size_t, nss_ldap_parse_next_fn, nss_ldap_parse_destroy_fn); -extern int __nss_ldap_log(int level, char const *fmt, ...); +extern void __nss_ldap_log(int level, char const *fmt, ...); extern void __nss_ldap_setent(int); #endif From owner-p4-projects@FreeBSD.ORG Fri Jan 26 13:56:49 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0648416A406; Fri, 26 Jan 2007 13:56:49 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 62DE816A401 for ; Fri, 26 Jan 2007 13:56:48 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3E13E13C4B4 for ; Fri, 26 Jan 2007 13:56:48 +0000 (UTC) (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 l0QDumRQ043016 for ; Fri, 26 Jan 2007 13:56:48 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0QDulGq043013 for perforce@freebsd.org; Fri, 26 Jan 2007 13:56:47 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 26 Jan 2007 13:56:47 GMT Message-Id: <200701261356.l0QDulGq043013@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 113561 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Jan 2007 13:56:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=113561 Change 113561 by hselasky@hselasky_mini_itx on 2007/01/26 13:56:26 Lower EHCI interrupt delay to increase performance. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci.c#23 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#23 (text+ko) ==== @@ -341,7 +341,7 @@ /* turn on controller */ EOWRITE4(sc, EHCI_USBCMD, - EHCI_CMD_ITC_2 | /* 2 microframes interrupt delay */ + EHCI_CMD_ITC_1 | /* 1 microframes interrupt delay */ (EOREAD4(sc, EHCI_USBCMD) & EHCI_CMD_FLS_M) | EHCI_CMD_ASE | EHCI_CMD_PSE | From owner-p4-projects@FreeBSD.ORG Fri Jan 26 15:28:43 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DBDE16A406; Fri, 26 Jan 2007 15:28:43 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 52CDD16A403 for ; Fri, 26 Jan 2007 15:28:43 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 44FB913C48A for ; Fri, 26 Jan 2007 15:28:43 +0000 (UTC) (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 l0QFShM0066874 for ; Fri, 26 Jan 2007 15:28:43 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0QFShle066871 for perforce@freebsd.org; Fri, 26 Jan 2007 15:28:43 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 26 Jan 2007 15:28:43 GMT Message-Id: <200701261528.l0QFShle066871@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 113565 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Jan 2007 15:28:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=113565 Change 113565 by hselasky@hselasky_mini_itx on 2007/01/26 15:28:16 Fix a small bug introduced by change 113559: High speed isochronous transfers take 8 times more frames per second than full speed isochronous transfers. Add a rounded up divide by 8. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci.c#24 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#24 (text+ko) ==== @@ -2705,7 +2705,7 @@ DPRINTFN(2,("start next=%d\n", xfer->pipe->isoc_next)); } - xfer->isoc_complete_time = (xfer->pipe->isoc_next + xfer->nframes) % USBD_ISOC_TIME_MAX; + xfer->isoc_complete_time = (xfer->pipe->isoc_next + ((xfer->nframes+7)/8)) % USBD_ISOC_TIME_MAX; nframes = xfer->nframes; From owner-p4-projects@FreeBSD.ORG Fri Jan 26 16:06:31 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D815A16A404; Fri, 26 Jan 2007 16:06:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9741F16A402 for ; Fri, 26 Jan 2007 16:06:30 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7C67513C4B6 for ; Fri, 26 Jan 2007 16:06:30 +0000 (UTC) (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 l0QG6Umq074408 for ; Fri, 26 Jan 2007 16:06:30 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0QG6U7V074405 for perforce@freebsd.org; Fri, 26 Jan 2007 16:06:30 GMT (envelope-from bushman@freebsd.org) Date: Fri, 26 Jan 2007 16:06:30 GMT Message-Id: <200701261606.l0QG6U7V074405@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 113566 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Jan 2007 16:06:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=113566 Change 113566 by bushman@bushman_nss_ldap_cached on 2007/01/26 16:06:24 log messages fixed - were broken in ldap_passwd.c Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_passwd.c#19 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldap_passwd.c#19 (text+ko) ==== @@ -188,7 +188,7 @@ _ATM(schema, PASSWD, uid), &pwd->pw_name, &len, buf, buflen); if (rv != NSS_LDAP_SUCCESS) { - __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: ", + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: " "can't assign %s, error %d (%s)", _ATM(schema, PASSWD, uid), rv, __nss_ldap_err2str(rv)); goto errfin; @@ -200,7 +200,7 @@ _ATM(schema, PASSWD, gecos), &pwd->pw_gecos, &len, buf, buflen); if (rv != NSS_LDAP_SUCCESS) { - __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_passwd: ", + __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_passwd: " "can't assign %s, error %d (%s), falling back to %s", _ATM(schema, PASSWD, gecos), rv, __nss_ldap_err2str(rv), _ATM(schema, PASSWD, cn)); @@ -210,7 +210,7 @@ &pwd->pw_gecos, &len, buf, buflen); if (rv != NSS_LDAP_SUCCESS) { - __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: ", + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: " "can't assign %s, error %d (%s)", _ATM(schema, PASSWD, cn), rv, __nss_ldap_err2str(rv)); goto errfin; @@ -224,14 +224,14 @@ _ATM(schema, PASSWD, homeDirectory), &pwd->pw_dir, &len, buf, buflen); if (rv != NSS_LDAP_SUCCESS) { - __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_passwd: ", + __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_passwd: " "can't assign %s, error %d (%s), falling back to empty " "value", _ATM(schema, PASSWD, homeDirectory), rv, __nss_ldap_err2str(rv)); rv = __nss_ldap_assign_str("", &pwd->pw_dir, &len, buf, buflen); if (rv != NSS_LDAP_SUCCESS) { - __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: ", + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: " "can't assign empty value as home directory, " "error %d (%s)", rv, __nss_ldap_err2str(rv)); goto errfin; @@ -244,7 +244,7 @@ _ATM(schema, PASSWD, loginShell), &pwd->pw_shell, &len, buf, buflen); if (rv != NSS_LDAP_SUCCESS) { - __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_passwd: ", + __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_passwd: " "can't assign %s, error %d (%s), falling back to empty " "value", _ATM(schema, PASSWD, loginShell), rv, __nss_ldap_err2str(rv)); @@ -252,7 +252,7 @@ rv = __nss_ldap_assign_str("", &pwd->pw_shell, &len, buf, buflen); if (rv != NSS_LDAP_SUCCESS) { - __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: ", + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: " "can't assign empty value as user shell, " "error %d (%s)", rv, __nss_ldap_err2str(rv)); goto errfin; @@ -265,7 +265,7 @@ _ATM(schema, PASSWD, loginClass), &pwd->pw_class, &len, buf, buflen); if (rv != NSS_LDAP_SUCCESS) { - __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_passwd: ", + __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_passwd: " "can't assign %s, error %d (%s), falling back to empty " "value", _ATM(schema, PASSWD, loginClass), rv, __nss_ldap_err2str(rv)); @@ -273,7 +273,7 @@ rv = __nss_ldap_assign_str("", &pwd->pw_class, &len, buf, buflen); if (rv != NSS_LDAP_SUCCESS) { - __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: ", + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: " "can't assign empty value as login class, " "error %d (%s)", rv, __nss_ldap_err2str(rv)); goto errfin; @@ -286,7 +286,7 @@ _ATM(schema, PASSWD, uidNumber), &pwd->pw_uid); if (rv != NSS_LDAP_SUCCESS) { - __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: ", + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: " "can't assign %s, error %d (%s)", _ATM(schema, PASSWD, uidNumber), rv, __nss_ldap_err2str(rv)); goto errfin; @@ -296,7 +296,7 @@ _ATM(schema, PASSWD, gidNumber), &pwd->pw_gid); if (rv != NSS_LDAP_SUCCESS) { - __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: ", + __nss_ldap_log(NSS_LDAP_LL_WARN, "nss_ldap_parse_passwd: " "can't assign %s, error %d (%s)", _ATM(schema, PASSWD, gidNumber), rv, __nss_ldap_err2str(rv)); @@ -308,7 +308,7 @@ if (rv == NSS_LDAP_SUCCESS) pwd->pw_change *= 24*60*60; else { - __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_passwd: ", + __nss_ldap_log(NSS_LDAP_LL_WARN_INT, "nss_ldap_parse_passwd: " "can't assign %s, error %d (%s)", _ATM(schema, PASSWD, shadowMax), rv, __nss_ldap_err2str(rv)); From owner-p4-projects@FreeBSD.ORG Fri Jan 26 17:17:03 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79E3516A403; Fri, 26 Jan 2007 17:17:03 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3824A16A401 for ; Fri, 26 Jan 2007 17:17:03 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2883113C48A for ; Fri, 26 Jan 2007 17:17:03 +0000 (UTC) (envelope-from jkim@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0QHH38Y094986 for ; Fri, 26 Jan 2007 17:17:03 GMT (envelope-from jkim@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0QHH38J094983 for perforce@freebsd.org; Fri, 26 Jan 2007 17:17:03 GMT (envelope-from jkim@freebsd.org) Date: Fri, 26 Jan 2007 17:17:03 GMT Message-Id: <200701261717.l0QHH38J094983@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jkim@freebsd.org using -f From: Jung-uk Kim To: Perforce Change Reviews Cc: Subject: PERFORCE change 113570 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Jan 2007 17:17:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=113570 Change 113570 by jkim@jkim_hammer on 2007/01/26 17:16:57 Micro optimize and unconfuse. Pointed out by: netchild Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#30 edit .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#24 edit Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#30 (text+ko) ==== @@ -857,8 +857,7 @@ * Linux/ia64 does the same in i386 emulation mode. */ bsd_args.prot = linux_args->prot; - if ((bsd_args.prot & PROT_WRITE) || - (bsd_args.prot & (PROT_READ | PROT_EXEC))) + if (bsd_args.prot & (PROT_READ | PROT_WRITE | PROT_EXEC)) bsd_args.prot |= PROT_READ | PROT_EXEC; if (linux_args->fd != -1) { @@ -979,8 +978,7 @@ bsd_args.addr = uap->addr; bsd_args.len = uap->len; bsd_args.prot = uap->prot; - if ((bsd_args.prot & PROT_WRITE) || - (bsd_args.prot & (PROT_READ | PROT_EXEC))) + if (bsd_args.prot & (PROT_READ | PROT_WRITE | PROT_EXEC)) bsd_args.prot |= PROT_READ | PROT_EXEC; return (mprotect(td, &bsd_args)); } ==== //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#24 (text+ko) ==== @@ -658,8 +658,7 @@ * Linux/ia64 does the same in i386 emulation mode. */ bsd_args.prot = linux_args->prot; - if ((bsd_args.prot & PROT_WRITE) || - (bsd_args.prot & (PROT_READ | PROT_EXEC))) + if (bsd_args.prot & (PROT_READ | PROT_WRITE | PROT_EXEC)) bsd_args.prot |= PROT_READ | PROT_EXEC; if (linux_args->fd != -1) { @@ -780,8 +779,7 @@ bsd_args.addr = uap->addr; bsd_args.len = uap->len; bsd_args.prot = uap->prot; - if ((bsd_args.prot & PROT_WRITE) || - (bsd_args.prot & (PROT_READ | PROT_EXEC))) + if (bsd_args.prot & (PROT_READ | PROT_WRITE | PROT_EXEC)) bsd_args.prot |= PROT_READ | PROT_EXEC; return (mprotect(td, &bsd_args)); } From owner-p4-projects@FreeBSD.ORG Fri Jan 26 17:32:16 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 837BB16A404; Fri, 26 Jan 2007 17:32:16 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4389616A401 for ; Fri, 26 Jan 2007 17:32:16 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from anuket.mj.niksun.com (gwnew.niksun.com [65.115.46.162]) by mx1.freebsd.org (Postfix) with ESMTP id B9A6D13C48A for ; Fri, 26 Jan 2007 17:32:15 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from niksun.com (anuket [10.70.0.5]) by anuket.mj.niksun.com (8.13.6/8.13.6) with ESMTP id l0QHWE5J091487; Fri, 26 Jan 2007 12:32:14 -0500 (EST) (envelope-from jkim@FreeBSD.org) From: Jung-uk Kim To: Divacky Roman Date: Fri, 26 Jan 2007 12:32:08 -0500 User-Agent: KMail/1.6.2 References: <200701260449.l0Q4nuPf034232@repoman.freebsd.org> <20070126104347.GA71206@stud.fit.vutbr.cz> In-Reply-To: <20070126104347.GA71206@stud.fit.vutbr.cz> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200701261232.11317.jkim@FreeBSD.org> X-Virus-Scanned: ClamAV 0.88.6/2493/Fri Jan 26 07:00:46 2007 on anuket.mj.niksun.com X-Virus-Status: Clean Cc: Perforce Change Reviews Subject: Re: PERFORCE change 113545 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Jan 2007 17:32:16 -0000 On Friday 26 January 2007 05:43 am, Divacky Roman wrote: > > ==== > > //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#16 > > (text+ko) ==== > > > > @@ -774,7 +774,6 @@ > > l_uint limit_in_pages:1; > > l_uint seg_not_present:1; > > l_uint useable:1; > > - l_uint lm:1; > > }; > > > > struct l_desc_struct { > > @@ -798,7 +797,6 @@ > > #define ENTRY_B_USEABLE 20 > > #define ENTRY_B_SEG32BIT 22 > > #define ENTRY_B_LIMIT 23 > > -#define ENTRY_B_LONGMODE 21 > > > > #define LDT_entry_b(info) \ > > (((info)->base_addr & 0xff000000) | \ > > @@ -819,8 +817,7 @@ > > (info)->read_exec_only == 1 && \ > > (info)->seg_32bit == 0 && \ > > (info)->limit_in_pages == 0 && \ > > - (info)->useable == 0 && \ > > - (info)->lm == 0) > > + (info)->useable == 0 ) > > > > /* macros for converting segments, they do the same as those in > > arch/i386/kernel/process.c */ #define GET_BASE(desc) ( \ > > @@ -838,7 +835,6 @@ > > #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 GET_LONGMODE(desc) > > (((desc)->b >> ENTRY_B_LONGMODE) & 1) > > > > #define LINUX_CLOCK_REALTIME 0 > > #define LINUX_CLOCK_MONOTONIC 1 > > any particular reason why you deleted this? Sorry, I forgot to explain. This bit is not used and it has no meaning in Compatibility Mode. Actually you have to ignore the bit, e.g., you cannot test the bit for LDT_empty() macro. JK From owner-p4-projects@FreeBSD.ORG Fri Jan 26 20:37:15 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69C6316A404; Fri, 26 Jan 2007 20:37:15 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3F31216A402 for ; Fri, 26 Jan 2007 20:37:15 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2269C13C484 for ; Fri, 26 Jan 2007 20:37:15 +0000 (UTC) (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 l0QKbFK2030671 for ; Fri, 26 Jan 2007 20:37:15 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0QKbEAt030668 for perforce@freebsd.org; Fri, 26 Jan 2007 20:37:14 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 26 Jan 2007 20:37:14 GMT Message-Id: <200701262037.l0QKbEAt030668@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 113575 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 26 Jan 2007 20:37:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=113575 Change 113575 by hselasky@hselasky_mini_itx on 2007/01/26 20:36:33 Optimize use of "td_token" in "uhci_setup_standard_chain()". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uhci.c#20 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uhci.c#20 (text+ko) ==== @@ -1407,13 +1407,13 @@ usbd_page_dma_exit(td->page); td->td_status = td_status & htole32(~UHCI_TD_SPD); - td->td_token = - htole32(UHCI_TD_SET_ENDPT(xfer->endpoint)) | - htole32(UHCI_TD_SET_DEVADDR(xfer->address)) | - htole32(UHCI_TD_SET_MAXLEN(sizeof(usb_device_request_t))) | - htole32(UHCI_TD_PID_SETUP)| - htole32(UHCI_TD_SET_DT(0)); - + td_token = + (UHCI_TD_SET_ENDPT(xfer->endpoint) | + UHCI_TD_SET_DEVADDR(xfer->address) | + UHCI_TD_SET_MAXLEN(sizeof(usb_device_request_t)) | + UHCI_TD_PID_SETUP| + UHCI_TD_SET_DT(0)); + td->td_token = htole32(td_token); td->td_buffer = htole32(buf_res.physaddr); buf_offset += sizeof(usb_device_request_t); @@ -1444,14 +1444,14 @@ } td_token = - htole32(UHCI_TD_SET_ENDPT(xfer->endpoint)) | - htole32(UHCI_TD_SET_DEVADDR(xfer->address)) | - htole32(UHCI_TD_SET_MAXLEN(average)) | - (isread ? htole32(UHCI_TD_PID_IN) : htole32(UHCI_TD_PID_OUT)); + (UHCI_TD_SET_ENDPT(xfer->endpoint) | + UHCI_TD_SET_DEVADDR(xfer->address) | + UHCI_TD_SET_MAXLEN(average) | + (isread ? UHCI_TD_PID_IN : UHCI_TD_PID_OUT)); if(xfer->pipe->toggle_next) { - td_token |= htole32(UHCI_TD_SET_DT(1)); + td_token |= UHCI_TD_SET_DT(1); } while(1) @@ -1476,8 +1476,8 @@ average = len; /* update length */ - td_token &= htole32(~(0x7ff<<21)); - td_token |= htole32(UHCI_TD_SET_MAXLEN(average)); + td_token &= ~(0x7ff << 21); + td_token |= UHCI_TD_SET_MAXLEN(average); } if(td == NULL) @@ -1491,10 +1491,10 @@ /* fill out current TD */ td->td_status = td_status; - td->td_token = td_token; + td->td_token = htole32(td_token); td->td_buffer = htole32(buf_res.physaddr); - td_token ^= htole32(UHCI_TD_SET_DT(1)); + td_token ^= UHCI_TD_SET_DT(1); buf_offset += average; usbd_get_page(&(xfer->buf_data), buf_offset, &buf_res); @@ -1518,13 +1518,13 @@ /* STATUS message */ /* update length and PID */ - td_token &= htole32(~(0x7ff<<21)); - td_token |= htole32(UHCI_TD_SET_MAXLEN(0)|UHCI_TD_SET_DT(1)); - td_token ^= htole32(0x88); + td_token &= ~(0x7ff << 21); + td_token |= (UHCI_TD_SET_MAXLEN(0)|UHCI_TD_SET_DT(1)); + td_token ^= 0x00000088; usbd_page_dma_exit(td->page); - td->td_token = td_token; + td->td_token = htole32(td_token); td->td_buffer = htole32(0); td_last = td; @@ -1544,12 +1544,9 @@ xfer->td_transfer_last = td_last; /* store data-toggle */ - if(td_token & htole32(UHCI_TD_SET_DT(1))) - { + if (td_token & UHCI_TD_SET_DT(1)) { xfer->pipe->toggle_next = 1; - } - else - { + } else { xfer->pipe->toggle_next = 0; } From owner-p4-projects@FreeBSD.ORG Sat Jan 27 01:40:27 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4207516A409; Sat, 27 Jan 2007 01:40:27 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F3B7216A407 for ; Sat, 27 Jan 2007 01:40:26 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D977A13C4B3 for ; Sat, 27 Jan 2007 01:40:26 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0R1eQk3014768 for ; Sat, 27 Jan 2007 01:40:26 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0R1eQZW014765 for perforce@freebsd.org; Sat, 27 Jan 2007 01:40:26 GMT (envelope-from zec@FreeBSD.org) Date: Sat, 27 Jan 2007 01:40:26 GMT Message-Id: <200701270140.l0R1eQZW014765@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 113585 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Jan 2007 01:40:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=113585 Change 113585 by zec@zec_tca51 on 2007/01/27 01:40:23 Refactor gif(4) virtualization. Affected files ... .. //depot/projects/vimage/src/sys/net/if_gif.c#2 edit .. //depot/projects/vimage/src/sys/net/if_gif.h#2 edit .. //depot/projects/vimage/src/sys/netinet/in_gif.c#3 edit .. //depot/projects/vimage/src/sys/netinet/in_gif.h#2 edit .. //depot/projects/vimage/src/sys/netinet6/in6_gif.c#4 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#14 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if_gif.c#2 (text+ko) ==== @@ -33,6 +33,7 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_mac.h" +#include "opt_vimage.h" #include #include @@ -48,6 +49,8 @@ #include #include #include +#include + #include #include @@ -92,7 +95,9 @@ */ static struct mtx gif_mtx; static MALLOC_DEFINE(M_GIF, "gif", "Generic Tunnel Interface"); +#ifndef VIMAGE static LIST_HEAD(, gif_softc) gif_softc_list; +#endif void (*ng_gif_input_p)(struct ifnet *ifp, struct mbuf **mp, int af); void (*ng_gif_input_orphan_p)(struct ifnet *ifp, struct mbuf *m, int af); @@ -102,6 +107,8 @@ static void gif_start(struct ifnet *); static int gif_clone_create(struct if_clone *, int, caddr_t); static void gif_clone_destroy(struct ifnet *); +static int vnet_gif_iattach(void); +static int vnet_gif_idetach(void); IFC_SIMPLE_DECLARE(gif, 0); @@ -121,22 +128,37 @@ */ #define MAX_GIF_NEST 1 #endif -static int max_gif_nesting = MAX_GIF_NEST; -SYSCTL_INT(_net_link_gif, OID_AUTO, max_nesting, CTLFLAG_RW, - &max_gif_nesting, 0, "Max nested tunnels"); +#ifndef VIMAGE +static int max_gif_nesting; +#endif +SYSCTL_V_INT(V_NET, vnet_gif, _net_link_gif, OID_AUTO, max_nesting, + CTLFLAG_RW, max_gif_nesting, 0, "Max nested tunnels"); /* * By default, we disallow creation of multiple tunnels between the same * pair of addresses. Some applications require this functionality so * we allow control over this check here. */ +#ifndef VIMAGE #ifdef XBONEHACK static int parallel_tunnels = 1; #else static int parallel_tunnels = 0; #endif -SYSCTL_INT(_net_link_gif, OID_AUTO, parallel_tunnels, CTLFLAG_RW, - ¶llel_tunnels, 0, "Allow parallel tunnels?"); +#endif +SYSCTL_V_INT(V_NET, vnet_gif, _net_link_gif, OID_AUTO, parallel_tunnels, + CTLFLAG_RW, parallel_tunnels, 0, "Allow parallel tunnels?"); + +#ifdef VIMAGE +static struct vnet_modinfo vnet_gif_modinfo = { + .id = VNET_MOD_GIF, + .flags = VNET_MFLAG_ORDER_2ND, + .name = "gif", + .symmap = NULL, + .i_attach = vnet_gif_iattach, + .i_detach = vnet_gif_idetach +}; +#endif static int gif_clone_create(ifc, unit, params) @@ -144,6 +166,7 @@ int unit; caddr_t params; { + INIT_VNET_GIF(curvnetb); struct gif_softc *sc; sc = malloc(sizeof(struct gif_softc), M_GIF, M_WAITOK | M_ZERO); @@ -177,7 +200,7 @@ (*ng_gif_attach_p)(GIF2IFP(sc)); mtx_lock(&gif_mtx); - LIST_INSERT_HEAD(&gif_softc_list, sc, gif_list); + LIST_INSERT_HEAD(&V_gif_softc_list, sc, gif_list); mtx_unlock(&gif_mtx); return (0); @@ -219,6 +242,41 @@ free(sc, M_GIF); } +static int vnet_gif_iattach(void) +{ +#ifdef VIMAGE + struct vnet_gif *vnet_gif; + + vnet_gif = malloc(sizeof(*vnet_gif), M_GIF, M_NOWAIT | M_ZERO); + if (vnet_gif == NULL) + panic("couldn't allocate memory for vnet_gif"); + curvnetb->mod_data[vnet_gif_modinfo.id] = vnet_gif; + vnet_gif->parent_vnetb = curvnetb; +#endif + + LIST_INIT(&V_gif_softc_list); + V_max_gif_nesting = MAX_GIF_NEST; + V_ip_gif_ttl = GIF_TTL; + +#ifdef INET6 + V_ip6_gif_hlim = GIF_HLIM; +#endif + + return 0; +} + +static int vnet_gif_idetach(void) +{ + INIT_VNET_GIF(curvnetb); + +#ifdef VIMAGE + curvnetb->mod_data[vnet_gif_modinfo.id] = NULL; + free(vnet_gif, M_GIF); +#endif + + return 0; +} + static int gifmodevent(mod, type, data) module_t mod; @@ -229,20 +287,21 @@ switch (type) { case MOD_LOAD: mtx_init(&gif_mtx, "gif_mtx", NULL, MTX_DEF); - LIST_INIT(&gif_softc_list); +#ifdef VIMAGE + vnet_mod_register(&vnet_gif_modinfo); +#else + vnet_gif_iattach(); +#endif if_clone_attach(&gif_cloner); - -#ifdef INET6 - ip6_gif_hlim = GIF_HLIM; -#endif - break; case MOD_UNLOAD: if_clone_detach(&gif_cloner); +#ifdef VIMAGE + vnet_mod_deregister(&vnet_gif_modinfo); +#else + vnet_gif_idetach(); +#endif mtx_destroy(&gif_mtx); -#ifdef INET6 - ip6_gif_hlim = 0; -#endif break; default: return EOPNOTSUPP; @@ -353,6 +412,7 @@ struct sockaddr *dst; struct rtentry *rt; /* added in net2 */ { + INIT_VNET_GIF(ifp->if_vnetb); struct gif_softc *sc = ifp->if_softc; struct m_tag *mtag; int error = 0; @@ -388,7 +448,7 @@ mtag = m_tag_locate(m, MTAG_GIF, MTAG_GIF_CALLED, mtag); gif_called++; } - if (gif_called > max_gif_nesting) { + if (gif_called > V_max_gif_nesting) { log(LOG_NOTICE, "gif_output: recursively called too many times(%d)\n", gif_called); @@ -822,13 +882,14 @@ struct sockaddr *src; struct sockaddr *dst; { + INIT_VNET_GIF(ifp->if_vnetb); struct gif_softc *sc = ifp->if_softc; struct gif_softc *sc2; struct sockaddr *osrc, *odst, *sa; int error = 0; mtx_lock(&gif_mtx); - LIST_FOREACH(sc2, &gif_softc_list, gif_list) { + LIST_FOREACH(sc2, &V_gif_softc_list, gif_list) { if (sc2 == sc) continue; if (!sc2->gif_pdst || !sc2->gif_psrc) @@ -843,7 +904,7 @@ * Disallow parallel tunnels unless instructed * otherwise. */ - if (!parallel_tunnels && + if (!V_parallel_tunnels && bcmp(sc2->gif_pdst, dst, dst->sa_len) == 0 && bcmp(sc2->gif_psrc, src, src->sa_len) == 0) { error = EADDRNOTAVAIL; ==== //depot/projects/vimage/src/sys/net/if_gif.h#2 (text+ko) ==== @@ -109,6 +109,31 @@ void gif_delete_tunnel(struct ifnet *); int gif_encapcheck(const struct mbuf *, int, int, void *); +/* + * Virtualization support + */ + +#define INIT_VNET_GIF(vnetb) \ + INIT_FROM_VNET_BASE(vnetb, VNET_MOD_GIF, struct vnet_gif, vnet_gif) + +#define VNET_GIF(sym) VSYM(vnet_gif, sym) + +struct vnet_gif { + struct vnet_base *parent_vnetb; + + LIST_HEAD(, gif_softc) _gif_softc_list; + int _max_gif_nesting; + int _parallel_tunnels; + int _ip_gif_ttl; + int _ip6_gif_hlim; +}; + +#define V_gif_softc_list VNET_GIF(gif_softc_list) +#define V_max_gif_nesting VNET_GIF(max_gif_nesting) +#define V_parallel_tunnels VNET_GIF(parallel_tunnels) +#define V_ip_gif_ttl VNET_GIF(ip_gif_ttl) +#define V_ip6_gif_hlim VNET_GIF(ip6_gif_hlim) + #endif /* _KERNEL */ #endif /* _NET_IF_GIF_H_ */ ==== //depot/projects/vimage/src/sys/netinet/in_gif.c#3 (text+ko) ==== @@ -72,7 +72,6 @@ static int gif_validate4(const struct ip *, struct gif_softc *, struct ifnet *); -static void in_gif_init(void); extern struct domain inetdomain; struct protosw in_gif_protosw = { @@ -83,31 +82,22 @@ .pr_input = in_gif_input, .pr_output = (pr_output_t*)rip_output, .pr_ctloutput = rip_ctloutput, - .pr_init = in_gif_init, .pr_usrreqs = &rip_usrreqs }; #ifndef VIMAGE static int ip_gif_ttl; #endif -SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, IPCTL_GIF_TTL, gifttl, +SYSCTL_V_INT(V_NET, vnet_gif, _net_inet_ip, IPCTL_GIF_TTL, gifttl, CTLFLAG_RW, ip_gif_ttl, 0, ""); -static void -in_gif_init(void) -{ - INIT_VNET_INET(curvnetb); - - V_ip_gif_ttl = GIF_TTL; -} - int in_gif_output(ifp, family, m) struct ifnet *ifp; int family; struct mbuf *m; { - INIT_VNET_INET(ifp->if_vnetb); + INIT_VNET_GIF(ifp->if_vnetb); struct gif_softc *sc = ifp->if_softc; struct sockaddr_in *dst = (struct sockaddr_in *)&sc->gif_ro.ro_dst; struct sockaddr_in *sin_src = (struct sockaddr_in *)sc->gif_psrc; ==== //depot/projects/vimage/src/sys/netinet/in_gif.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet6/in6_gif.c#4 (text+ko) ==== @@ -88,6 +88,7 @@ int family; /* family of the packet to be encapsulate. */ struct mbuf *m; { + INIT_VNET_GIF(ifp->if_vnetb); struct gif_softc *sc = ifp->if_softc; struct sockaddr_in6 *dst = (struct sockaddr_in6 *)&sc->gif_ro6.ro_dst; struct sockaddr_in6 *sin6_src = (struct sockaddr_in6 *)sc->gif_psrc; @@ -176,7 +177,7 @@ ip6->ip6_vfc |= IPV6_VERSION; ip6->ip6_plen = htons((u_short)m->m_pkthdr.len); ip6->ip6_nxt = proto; - ip6->ip6_hlim = ip6_gif_hlim; + ip6->ip6_hlim = V_ip6_gif_hlim; ip6->ip6_src = sin6_src->sin6_addr; /* bidirectional configured tunnel mode */ if (!IN6_IS_ADDR_UNSPECIFIED(&sin6_dst->sin6_addr)) ==== //depot/projects/vimage/src/sys/sys/vimage.h#14 (text+ko) ==== @@ -67,7 +67,10 @@ #define VNET_MOD_INET6 3 #define VNET_MOD_IPX 4 #define VNET_MOD_ATALK 5 + #define VNET_MOD_IPFW 8 +#define VNET_MOD_GIF 9 + #define VNET_MOD_ARP 29 #define VNET_MOD_RTABLE 30 #define VNET_MOD_LOIF 31 @@ -80,6 +83,7 @@ #define V_MOD_vnet_inet VNET_MOD_INET #define V_MOD_vnet_inet6 VNET_MOD_INET6 #define V_MOD_vnet_ipfw VNET_MOD_IPFW +#define V_MOD_vnet_gif VNET_MOD_GIF struct vnet_base { LIST_ENTRY(vnet_base) vnetb_le; From owner-p4-projects@FreeBSD.ORG Sat Jan 27 01:49:39 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9194716A406; Sat, 27 Jan 2007 01:49:39 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 62CF516A402 for ; Sat, 27 Jan 2007 01:49:39 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5369813C4A3 for ; Sat, 27 Jan 2007 01:49:39 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0R1ndV6016337 for ; Sat, 27 Jan 2007 01:49:39 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0R1ndUQ016334 for perforce@freebsd.org; Sat, 27 Jan 2007 01:49:39 GMT (envelope-from zec@FreeBSD.org) Date: Sat, 27 Jan 2007 01:49:39 GMT Message-Id: <200701270149.l0R1ndUQ016334@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 113586 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Jan 2007 01:49:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=113586 Change 113586 by zec@zec_tca51 on 2007/01/27 01:48:59 Honor the XBONEHACK option when initializing gif knobs. Affected files ... .. //depot/projects/vimage/src/sys/net/if_gif.c#3 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if_gif.c#3 (text+ko) ==== @@ -140,11 +140,7 @@ * we allow control over this check here. */ #ifndef VIMAGE -#ifdef XBONEHACK -static int parallel_tunnels = 1; -#else -static int parallel_tunnels = 0; -#endif +static int parallel_tunnels; #endif SYSCTL_V_INT(V_NET, vnet_gif, _net_link_gif, OID_AUTO, parallel_tunnels, CTLFLAG_RW, parallel_tunnels, 0, "Allow parallel tunnels?"); @@ -256,7 +252,10 @@ LIST_INIT(&V_gif_softc_list); V_max_gif_nesting = MAX_GIF_NEST; - V_ip_gif_ttl = GIF_TTL; +#ifdef XBONEHACK + V_parallel_tunnels = 1; +#endif + V_ip_gif_ttl = GIF_TTL; #ifdef INET6 V_ip6_gif_hlim = GIF_HLIM; From owner-p4-projects@FreeBSD.ORG Sat Jan 27 01:53:45 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FA2516A403; Sat, 27 Jan 2007 01:53:45 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 518FF16A400 for ; Sat, 27 Jan 2007 01:53:45 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 42B8A13C481 for ; Sat, 27 Jan 2007 01:53:45 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0R1rja9017242 for ; Sat, 27 Jan 2007 01:53:45 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0R1ri7g017236 for perforce@freebsd.org; Sat, 27 Jan 2007 01:53:44 GMT (envelope-from zec@FreeBSD.org) Date: Sat, 27 Jan 2007 01:53:44 GMT Message-Id: <200701270153.l0R1ri7g017236@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 113587 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Jan 2007 01:53:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=113587 Change 113587 by zec@zec_tca51 on 2007/01/27 01:52:46 Comment out an assert that is not valid in VIMAGE kernels, since we don't track interface unit numbers via bitmaps. Affected files ... .. //depot/projects/vimage/src/sys/net/if_clone.c#4 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if_clone.c#4 (text+ko) ==== @@ -442,12 +442,12 @@ goto done; } +#ifndef VIMAGE if (!wildcard) { bytoff = *unit >> 3; bitoff = *unit - (bytoff << 3); } -#ifndef VIMAGE if((ifc->ifc_units[bytoff] & (1 << bitoff)) != 0) { err = EEXIST; goto done; @@ -469,9 +469,9 @@ void ifc_free_unit(struct if_clone *ifc, int unit) { +#ifndef VIMAGE int bytoff, bitoff; - /* * Compute offset in the bitmap and deallocate the unit. */ @@ -483,6 +483,7 @@ ("%s: bit is already cleared", __func__)); ifc->ifc_units[bytoff] &= ~(1 << bitoff); IF_CLONE_REMREF_LOCKED(ifc); /* releases lock */ +#endif } void From owner-p4-projects@FreeBSD.ORG Sat Jan 27 11:05:04 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4533416A402; Sat, 27 Jan 2007 11:05:04 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 06B8116A404 for ; Sat, 27 Jan 2007 11:05:03 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DF1C113C487 for ; Sat, 27 Jan 2007 11:05:03 +0000 (UTC) (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 l0RB53bp031710 for ; Sat, 27 Jan 2007 11:05:03 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0RB4vLH031696 for perforce@freebsd.org; Sat, 27 Jan 2007 11:04:57 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 27 Jan 2007 11:04:57 GMT Message-Id: <200701271104.l0RB4vLH031696@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 113595 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Jan 2007 11:05:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=113595 Change 113595 by rdivacky@rdivacky_witten on 2007/01/27 11:04:10 IFC Affected files ... .. //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#13 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/mptable_pci.c#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/msi.c#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/amd64/nexus.c#5 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/clock.h#3 integrate .. //depot/projects/linuxolator/src/sys/amd64/include/intr_machdep.h#5 integrate .. //depot/projects/linuxolator/src/sys/amd64/isa/clock.c#4 integrate .. //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#31 integrate .. //depot/projects/linuxolator/src/sys/amd64/pci/pci_bus.c#4 integrate .. //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_mem.c#2 integrate .. //depot/projects/linuxolator/src/sys/cam/scsi/scsi_da.c#8 integrate .. //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#11 integrate .. //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#26 integrate .. //depot/projects/linuxolator/src/sys/conf/files.sparc64#6 integrate .. //depot/projects/linuxolator/src/sys/conf/options.sun4v#2 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_pcib_acpi.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/acpica/acpi_pcib_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/if_ath.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/ath/if_ath_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/bce/if_bce.c#10 integrate .. //depot/projects/linuxolator/src/sys/dev/esp/esp_sbus.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_freebsd.c#8 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_freebsd.h#6 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_pci.c#9 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_sbus.c#5 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_target.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_target.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/isp_tpublic.h#3 integrate .. //depot/projects/linuxolator/src/sys/dev/isp/ispvar.h#6 integrate .. //depot/projects/linuxolator/src/sys/dev/le/if_le_cbus.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/le/if_le_isa.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/le/if_le_lebuffer.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/le/if_le_ledma.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/le/if_le_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/le/lance.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/le/lebuffer_sbus.c#1 branch .. //depot/projects/linuxolator/src/sys/dev/mc146818/mc146818reg.h#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mfi/mfi_pci.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/brgphy.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/gentbi.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/mii.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/miidevs#6 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/rlphy.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/mii/ukphy.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/mpt/mpt_cam.c#11 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci.c#15 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci_if.m#4 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci_pci.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pci_private.h#6 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pcib_if.m#4 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pcib_private.h#5 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pcireg.h#5 integrate .. //depot/projects/linuxolator/src/sys/dev/pci/pcivar.h#6 integrate .. //depot/projects/linuxolator/src/sys/dev/re/if_re.c#7 integrate .. //depot/projects/linuxolator/src/sys/dev/sk/if_sk.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/es137x.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/sbus/cs4231.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/linuxolator/src/sys/dev/sound/usb/uaudio_pcm.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/stge/if_stge.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/sym/sym_hipd.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/ti/if_ti.c#3 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/linuxolator/src/sys/fs/deadfs/dead_vnops.c#2 integrate .. //depot/projects/linuxolator/src/sys/geom/geom_vfs.c#2 integrate .. //depot/projects/linuxolator/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/cpufreq/powernow.c#2 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/machdep.c#11 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/mp_machdep.c#5 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/mptable_pci.c#4 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/msi.c#3 integrate .. //depot/projects/linuxolator/src/sys/i386/i386/nexus.c#5 integrate .. //depot/projects/linuxolator/src/sys/i386/include/clock.h#3 integrate .. //depot/projects/linuxolator/src/sys/i386/include/intr_machdep.h#5 integrate .. //depot/projects/linuxolator/src/sys/i386/isa/clock.c#4 integrate .. //depot/projects/linuxolator/src/sys/i386/linux/linux_machdep.c#25 integrate .. //depot/projects/linuxolator/src/sys/i386/pci/pci_bus.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/init_main.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_fork.c#10 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_idle.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_intr.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_kse.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_kthread.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_mbuf.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_switch.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/kern_thr.c#8 integrate .. //depot/projects/linuxolator/src/sys/kern/sched_4bsd.c#9 integrate .. //depot/projects/linuxolator/src/sys/kern/sched_core.c#3 integrate .. //depot/projects/linuxolator/src/sys/kern/sched_ule.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/linuxolator/src/sys/kern/subr_turnstile.c#4 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_mbuf.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_socket.c#9 integrate .. //depot/projects/linuxolator/src/sys/kern/uipc_syscalls.c#6 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_bio.c#7 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_export.c#5 integrate .. //depot/projects/linuxolator/src/sys/kern/vfs_lookup.c#5 integrate .. //depot/projects/linuxolator/src/sys/modules/le/Makefile#2 integrate .. //depot/projects/linuxolator/src/sys/netgraph/ng_ppp.c#4 integrate .. //depot/projects/linuxolator/src/sys/netinet/ip_carp.c#5 integrate .. //depot/projects/linuxolator/src/sys/netinet6/nd6.c#7 integrate .. //depot/projects/linuxolator/src/sys/nfs4client/nfs4_vfs_subs.c#2 integrate .. //depot/projects/linuxolator/src/sys/nfs4client/nfs4_vfsops.c#3 integrate .. //depot/projects/linuxolator/src/sys/nfs4client/nfs4_vnops.c#3 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/nfs.h#4 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/nfs_vfsops.c#6 integrate .. //depot/projects/linuxolator/src/sys/nfsclient/nfs_vnops.c#6 integrate .. //depot/projects/linuxolator/src/sys/pc98/cbus/clock.c#3 integrate .. //depot/projects/linuxolator/src/sys/pc98/pc98/machdep.c#8 integrate .. //depot/projects/linuxolator/src/sys/pci/if_rl.c#5 integrate .. //depot/projects/linuxolator/src/sys/powerpc/include/ipl.h#2 delete .. //depot/projects/linuxolator/src/sys/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/projects/linuxolator/src/sys/sparc64/sparc64/upa.c#2 integrate .. //depot/projects/linuxolator/src/sys/sys/buf.h#3 integrate .. //depot/projects/linuxolator/src/sys/sys/bufobj.h#2 integrate .. //depot/projects/linuxolator/src/sys/sys/mbuf.h#6 integrate .. //depot/projects/linuxolator/src/sys/sys/param.h#9 integrate .. //depot/projects/linuxolator/src/sys/sys/proc.h#11 integrate .. //depot/projects/linuxolator/src/sys/sys/sched.h#5 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_alloc.c#4 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_extern.h#3 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_snapshot.c#4 integrate .. //depot/projects/linuxolator/src/sys/ufs/ffs/ffs_vfsops.c#6 integrate .. //depot/projects/linuxolator/src/sys/ufs/ufs/quota.h#2 integrate .. //depot/projects/linuxolator/src/sys/ufs/ufs/ufs_quota.c#5 integrate .. //depot/projects/linuxolator/src/sys/vm/uma.h#3 integrate .. //depot/projects/linuxolator/src/sys/vm/uma_core.c#5 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_glue.c#4 integrate .. //depot/projects/linuxolator/src/sys/vm/vm_zeroidle.c#4 integrate Differences ... ==== //depot/projects/linuxolator/src/sys/amd64/amd64/machdep.c#13 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.667 2006/12/20 04:40:38 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.668 2007/01/23 08:01:19 bde Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1185,7 +1185,6 @@ * under witness. */ mutex_init(); - mtx_init(&clock_lock, "clk", NULL, MTX_SPIN); mtx_init(&icu_lock, "icu", NULL, MTX_SPIN | MTX_NOWITNESS); /* exceptions */ @@ -1216,6 +1215,12 @@ lidt(&r_idt); /* + * Initialize the i8254 before the console so that console + * initialization can use DELAY(). + */ + i8254_init(); + + /* * Initialize the console before we print anything out. */ cninit(); ==== //depot/projects/linuxolator/src/sys/amd64/amd64/mp_machdep.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.279 2007/01/11 00:17:02 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.280 2007/01/23 08:38:39 jeff Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -949,15 +949,12 @@ ipi_bitmap = atomic_readandclear_int(&cpu_ipi_pending[cpu]); if (ipi_bitmap & (1 << IPI_PREEMPT)) { + struct thread *running_thread = curthread; mtx_lock_spin(&sched_lock); - /* Don't preempt the idle thread */ - if (curthread != PCPU_GET(idlethread)) { - struct thread *running_thread = curthread; - if (running_thread->td_critnest > 1) - running_thread->td_owepreempt = 1; - else - mi_switch(SW_INVOL | SW_PREEMPT, NULL); - } + if (running_thread->td_critnest > 1) + running_thread->td_owepreempt = 1; + else + mi_switch(SW_INVOL | SW_PREEMPT, NULL); mtx_unlock_spin(&sched_lock); } ==== //depot/projects/linuxolator/src/sys/amd64/amd64/mptable_pci.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.6 2006/12/12 19:27:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.7 2007/01/22 21:48:42 jhb Exp $"); #include #include @@ -120,6 +120,7 @@ DEVMETHOD(pcib_alloc_msi, mptable_hostb_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), DEVMETHOD(pcib_alloc_msix, mptable_hostb_alloc_msix), + DEVMETHOD(pcib_remap_msix, pcib_remap_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), { 0, 0 } @@ -176,6 +177,7 @@ DEVMETHOD(pcib_alloc_msi, pcib_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), DEVMETHOD(pcib_alloc_msix, pcib_alloc_msix), + DEVMETHOD(pcib_remap_msix, pcib_remap_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), {0, 0} ==== //depot/projects/linuxolator/src/sys/amd64/amd64/msi.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.2 2006/11/15 18:40:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.3 2007/01/22 21:48:42 jhb Exp $"); #include #include @@ -480,6 +480,30 @@ } int +msix_remap(int index, int irq) +{ + struct msi_intsrc *msi; + + sx_xlock(&msi_sx); + msi = (struct msi_intsrc *)intr_lookup_source(irq); + if (msi == NULL) { + sx_xunlock(&msi_sx); + return (ENOENT); + } + + /* Make sure this is an MSI-X message. */ + if (!msi->msi_msix) { + sx_xunlock(&msi_sx); + return (EINVAL); + } + + KASSERT(msi->msi_dev != NULL, ("unowned message")); + msi->msi_index = index; + sx_xunlock(&msi_sx); + return (0); +} + +int msix_release(int irq) { struct msi_intsrc *msi; ==== //depot/projects/linuxolator/src/sys/amd64/amd64/nexus.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.71 2007/01/11 19:40:19 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.72 2007/01/22 21:48:42 jhb Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -105,6 +105,7 @@ static int nexus_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, int *irqs); static int nexus_release_msi(device_t pcib, device_t dev, int count, int *irqs); static int nexus_alloc_msix(device_t pcib, device_t dev, int index, int *irq); +static int nexus_remap_msix(device_t pcib, device_t dev, int index, int irq); static int nexus_release_msix(device_t pcib, device_t dev, int irq); static device_method_t nexus_methods[] = { @@ -135,6 +136,7 @@ DEVMETHOD(pcib_alloc_msi, nexus_alloc_msi), DEVMETHOD(pcib_release_msi, nexus_release_msi), DEVMETHOD(pcib_alloc_msix, nexus_alloc_msix), + DEVMETHOD(pcib_remap_msix, nexus_remap_msix), DEVMETHOD(pcib_release_msix, nexus_release_msix), { 0, 0 } @@ -510,6 +512,13 @@ } static int +nexus_remap_msix(device_t pcib, device_t dev, int index, int irq) +{ + + return (msix_remap(index, irq)); +} + +static int nexus_release_msix(device_t pcib, device_t dev, int irq) { ==== //depot/projects/linuxolator/src/sys/amd64/include/clock.h#3 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.53 2006/10/02 12:59:55 phk Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.54 2007/01/23 08:01:19 bde Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -22,7 +22,8 @@ extern int timer0_max_count; extern uint64_t tsc_freq; extern int tsc_is_broken; -extern struct mtx clock_lock; + +void i8254_init(void); /* * Driver to clock driver interface. ==== //depot/projects/linuxolator/src/sys/amd64/include/intr_machdep.h#5 (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/amd64/include/intr_machdep.h,v 1.13 2006/12/12 19:24:45 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.14 2007/01/22 21:48:42 jhb Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -152,6 +152,7 @@ void msi_init(void); int msi_release(int *irqs, int count); int msix_alloc(device_t dev, int index, int *irq, int *new); +int msix_remap(int index, int irq); int msix_release(int irq); #endif /* !LOCORE */ ==== //depot/projects/linuxolator/src/sys/amd64/isa/clock.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.228 2006/12/03 03:49:28 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.229 2007/01/23 08:01:20 bde Exp $"); /* * Routines to handle clock hardware. @@ -103,11 +103,11 @@ u_int timer_freq = TIMER_FREQ; int timer0_max_count; int timer0_real_max_count; -struct mtx clock_lock; #define RTC_LOCK mtx_lock_spin(&clock_lock) #define RTC_UNLOCK mtx_unlock_spin(&clock_lock) static int beeping = 0; +static struct mtx clock_lock; static const u_char daysinmonth[] = {31,28,31,30,31,30,31,31,30,31,30,31}; static struct intsrc *i8254_intsrc; static u_int32_t i8254_lastcount; @@ -295,13 +295,6 @@ printf("DELAY(%d)...", n); #endif /* - * Guard against the timer being uninitialized if we are called - * early for console i/o. - */ - if (timer0_max_count == 0) - set_timer_freq(timer_freq, hz); - - /* * Read the counter first, so that the rest of the setup overhead is * counted. Guess the initial overhead is 20 usec (on most systems it * takes about 1.5 usec for each of the i/o's in getit(). The loop @@ -560,10 +553,15 @@ mtx_unlock_spin(&clock_lock); } -/* - * Initialize 8254 timer 0 early so that it can be used in DELAY(). - * XXX initialization of other timers is unintentionally left blank. - */ +/* This is separate from startrtclock() so that it can be called early. */ +void +i8254_init(void) +{ + + mtx_init(&clock_lock, "clk", NULL, MTX_SPIN); + set_timer_freq(timer_freq, hz); +} + void startrtclock() { @@ -572,7 +570,6 @@ writertc(RTC_STATUSA, rtc_statusa); writertc(RTC_STATUSB, RTCSB_24HR); - set_timer_freq(timer_freq, hz); freq = calibrate_clocks(); #ifdef CLK_CALIBRATION_LOOP if (bootverbose) { ==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux32_machdep.c#31 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.26 2007/01/14 16:20:37 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.28 2007/01/23 08:46:49 jeff Exp $"); #include #include @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -502,7 +503,7 @@ /* make it run */ mtx_lock_spin(&sched_lock); TD_SET_CAN_RUN(td2); - setrunqueue(td2, SRQ_BORING); + sched_add(td2, SRQ_BORING); mtx_unlock_spin(&sched_lock); return (0); @@ -543,7 +544,7 @@ /* make it run */ mtx_lock_spin(&sched_lock); TD_SET_CAN_RUN(td2); - setrunqueue(td2, SRQ_BORING); + sched_add(td2, SRQ_BORING); mtx_unlock_spin(&sched_lock); /* wait for the children to exit, ie. emulate vfork */ @@ -742,7 +743,7 @@ */ mtx_lock_spin(&sched_lock); TD_SET_CAN_RUN(td2); - setrunqueue(td2, SRQ_BORING); + sched_add(td2, SRQ_BORING); mtx_unlock_spin(&sched_lock); td->td_retval[0] = p2->p_pid; ==== //depot/projects/linuxolator/src/sys/amd64/pci/pci_bus.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.119 2006/12/12 19:27:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.120 2007/01/22 21:48:42 jhb Exp $"); #include "opt_cpu.h" @@ -347,6 +347,7 @@ DEVMETHOD(pcib_alloc_msi, legacy_pcib_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), DEVMETHOD(pcib_alloc_msix, legacy_pcib_alloc_msix), + DEVMETHOD(pcib_remap_msix, pcib_remap_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), { 0, 0 } ==== //depot/projects/linuxolator/src/sys/arm/xscale/ixp425/ixp425_mem.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_mem.c,v 1.1 2006/11/19 23:55:23 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_mem.c,v 1.2 2007/01/26 01:37:32 kevlo Exp $"); #include #include @@ -47,8 +47,8 @@ static uint32_t sdram_64bit[] = { 0x00800000, /* 8M: One 2M x 32 chip */ 0x01000000, /* 16M: Two 2M x 32 chips */ - 0x01000000, /* 16M: One 4M x 32 chip */ - 0x02000000, /* 32M: Two 4M x 32 chips */ + 0x01000000, /* 16M: Two 4M x 16 chips */ + 0x02000000, /* 32M: Four 4M x 32 chips */ 0, 0, 0, 0 }; ==== //depot/projects/linuxolator/src/sys/cam/scsi/scsi_da.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.200 2006/12/05 07:45:28 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.202 2007/01/23 17:29:31 imp Exp $"); #include @@ -466,6 +466,14 @@ {T_DIRECT, SIP_MEDIA_REMOVABLE, "X-Micro", "Flash Disk", "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, + { + /* + * EasyMP3 EM732X USB 2.0 Flash MP3 Player + * PR: usb/96546 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "EM732X", "MP3 Player*", + "1.0"}, /*quirks*/ DA_Q_NO_SYNC_CACHE + }, }; static disk_strategy_t dastrategy; ==== //depot/projects/linuxolator/src/sys/compat/linprocfs/linprocfs.c#11 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.101 2006/11/27 21:10:55 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.105 2007/01/21 13:18:52 netchild Exp $"); #include #include @@ -121,7 +121,7 @@ * This character array is used with ki_stati-1 as an index and tries to * map our states to suitable linux states. */ -static char *linux_state = "RRSTZDD"; +static char linux_state[] = "RRSTZDD"; /* * Filler function for proc/meminfo @@ -513,15 +513,25 @@ linprocfs_doprocstat(PFS_FILL_ARGS) { struct kinfo_proc kp; + char state; + static int ratelimit = 0; PROC_LOCK(p); fill_kinfo_proc(p, &kp); sbuf_printf(sb, "%d", p->p_pid); #define PS_ADD(name, fmt, arg) sbuf_printf(sb, " " fmt, arg) PS_ADD("comm", "(%s)", p->p_comm); - KASSERT(kp.ki_stat <= sizeof(linux_state), - ("linprocfs: don't know how to handle unknown FreeBSD state")); - PS_ADD("state", "%c", linux_state[kp.ki_stat - 1]); + if (kp.ki_stat > sizeof(linux_state)) { + state = 'R'; + + if (ratelimit == 0) { + printf("linprocfs: don't know how to handle unknown FreeBSD state %d/%zd, mapping to R\n", + kp.ki_stat, sizeof(linux_state)); + ++ratelimit; + } + } else + state = linux_state[kp.ki_stat - 1]; + PS_ADD("state", "%c", state); PS_ADD("ppid", "%d", p->p_pptr ? p->p_pptr->p_pid : 0); PS_ADD("pgrp", "%d", p->p_pgid); PS_ADD("session", "%d", p->p_session->s_sid); ==== //depot/projects/linuxolator/src/sys/compat/linux/linux_emul.c#26 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.12 2007/01/07 19:09:20 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_emul.c,v 1.13 2007/01/20 14:58:59 netchild Exp $"); #include "opt_compat.h" ==== //depot/projects/linuxolator/src/sys/conf/files.sparc64#6 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.86 2007/01/16 22:08:27 marius Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.87 2007/01/20 12:53:30 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -49,7 +49,9 @@ dev/fb/machfb.c optional machfb sc dev/hwpmc/hwpmc_sparc64.c optional hwpmc dev/kbd/kbd.c optional atkbd | sc | ukbd +dev/le/if_le_lebuffer.c optional le sbus dev/le/if_le_ledma.c optional le sbus +dev/le/lebuffer_sbus.c optional le sbus dev/ofw/ofw_bus_if.m standard dev/ofw/ofw_bus_subr.c standard dev/ofw/ofw_console.c optional ofw_console ==== //depot/projects/linuxolator/src/sys/conf/options.sun4v#2 (text+ko) ==== @@ -1,12 +1,7 @@ -# $FreeBSD: src/sys/conf/options.sun4v,v 1.1 2006/10/05 06:14:24 kmacy Exp $ +# $FreeBSD: src/sys/conf/options.sun4v,v 1.2 2007/01/19 12:22:50 marius Exp $ SUN4V opt_global.h -GFB_DEBUG opt_gfb.h -GFB_NO_FONT_LOADING opt_gfb.h -GFB_NO_MODE_CHANGE opt_gfb.h - -DEBUGGER_ON_POWERFAIL opt_psycho.h OFW_PCI_DEBUG opt_ofw_pci.h OFWCONS_POLL_HZ opt_ofw.h # Debug IOMMU inserts/removes using diagnostic accesses. Very loud. ==== //depot/projects/linuxolator/src/sys/dev/acpica/acpi_cpu.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.62 2007/01/15 18:17:36 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.63 2007/01/23 07:20:44 njl Exp $"); #include "opt_acpi.h" #include @@ -954,6 +954,8 @@ { device_t acpi_dev; + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); + /* * Bus mastering arbitration control is needed to keep caches coherent * while sleeping in C3. If it's not present but a working flush cache ==== //depot/projects/linuxolator/src/sys/dev/acpica/acpi_pcib_acpi.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.52 2006/12/12 19:27:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.53 2007/01/22 21:48:43 jhb Exp $"); #include "opt_acpi.h" #include @@ -110,6 +110,7 @@ DEVMETHOD(pcib_alloc_msi, acpi_pcib_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), DEVMETHOD(pcib_alloc_msix, acpi_pcib_alloc_msix), + DEVMETHOD(pcib_remap_msix, pcib_remap_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), {0, 0} ==== //depot/projects/linuxolator/src/sys/dev/acpica/acpi_pcib_pci.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_pci.c,v 1.15 2006/11/13 21:47:30 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_pci.c,v 1.16 2007/01/22 21:48:43 jhb Exp $"); #include "opt_acpi.h" @@ -96,6 +96,7 @@ DEVMETHOD(pcib_alloc_msi, pcib_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), DEVMETHOD(pcib_alloc_msix, pcib_alloc_msix), + DEVMETHOD(pcib_remap_msix, pcib_remap_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), {0, 0} ==== //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic79xx.h#2 (text+ko) ==== @@ -39,7 +39,7 @@ * * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#107 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.h,v 1.24 2005/01/06 01:42:25 imp Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.h,v 1.25 2007/01/19 22:37:52 jhb Exp $ */ #ifndef _AIC79XX_H_ @@ -1244,6 +1244,9 @@ /* PCI cacheline size. */ u_int pci_cachesize; + /* PCI-X capability offset. */ + int pcix_ptr; + /* IO Cell Parameters */ uint8_t iocell_opts[AHD_NUM_PER_DEV_ANNEXCOLS]; ==== //depot/projects/linuxolator/src/sys/dev/aic7xxx/aic79xx_pci.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #include "aic79xx_inline.h" #else #include -__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_pci.c,v 1.24 2005/12/04 02:12:40 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_pci.c,v 1.25 2007/01/19 22:37:52 jhb Exp $"); #include #include #endif @@ -342,7 +342,12 @@ error = entry->setup(ahd); if (error != 0) return (error); - + + /* + * Find the PCI-X cap pointer. If we don't find it, + * pcix_ptr will be 0. + */ + pci_find_extcap(ahd->dev_softc, PCIY_PCIX, &ahd->pcix_ptr); devconfig = aic_pci_read_config(ahd->dev_softc, DEVCONFIG, /*bytes*/4); if ((devconfig & PCIXINITPAT) == PCIXINIT_PCI33_66) { ahd->chip |= AHD_PCI; @@ -350,6 +355,8 @@ ahd->bugs &= ~AHD_PCIX_BUG_MASK; } else { ahd->chip |= AHD_PCIX; + if (ahd->pcix_ptr == 0) + return (ENXIO); } ahd->bus_description = pci_bus_modes[PCI_BUS_MODES_INDEX(devconfig)]; @@ -867,16 +874,16 @@ uint8_t sg_split_status1[2]; ahd_mode_state saved_modes; u_int i; - uint16_t pcix_status; + uint32_t pcix_status; /* * Check for splits in all modes. Modes 0 and 1 * additionally have SG engine splits to look at. */ - pcix_status = aic_pci_read_config(ahd->dev_softc, PCIXR_STATUS, - /*bytes*/2); + pcix_status = aic_pci_read_config(ahd->dev_softc, + ahd->pcix_ptr + PCIXR_STATUS, /*bytes*/ 4); printf("%s: PCI Split Interrupt - PCI-X status = 0x%x\n", - ahd_name(ahd), pcix_status); + ahd_name(ahd), pcix_status >> 16); saved_modes = ahd_save_modes(ahd); for (i = 0; i < 4; i++) { ahd_set_modes(ahd, i, i); @@ -922,8 +929,8 @@ /* * Clear PCI-X status bits. */ - aic_pci_write_config(ahd->dev_softc, PCIXR_STATUS, - pcix_status, /*bytes*/2); + aic_pci_write_config(ahd->dev_softc, ahd->pcix_ptr + PCIXR_STATUS, + pcix_status, /*bytes*/4); ahd_outb(ahd, CLRINT, CLRSPLTINT); ahd_restore_modes(ahd, saved_modes); } ==== //depot/projects/linuxolator/src/sys/dev/ath/if_ath.c#7 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.159 2007/01/15 01:15:57 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.160 2007/01/21 19:32:50 marius Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -2511,7 +2511,7 @@ /* * Setup DMA descriptor area. */ - error = bus_dma_tag_create(NULL, /* parent */ + error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), /* parent */ PAGE_SIZE, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ ==== //depot/projects/linuxolator/src/sys/dev/ath/if_ath_pci.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.16 2006/12/01 16:03:39 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.17 2007/01/21 19:32:50 marius Exp $"); /* * PCI/Cardbus front-end for the Atheros Wireless LAN controller driver. @@ -177,7 +177,7 @@ /* * Setup DMA descriptor area. */ - if (bus_dma_tag_create(NULL, /* parent */ + if (bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ 1, 0, /* alignment, bounds */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ ==== //depot/projects/linuxolator/src/sys/dev/bce/if_bce.c#10 (text) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.25 2007/01/13 04:35:15 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.27 2007/01/26 17:03:51 dwhite Exp $"); /* * The following controllers are supported by this driver: @@ -531,13 +531,6 @@ goto bce_attach_fail; } - if (BCE_CHIP_BOND_ID(sc) & BCE_CHIP_BOND_ID_SERDES_BIT) { - BCE_PRINTF(sc, "%s(%d): SerDes controllers are not supported!\n", - __FILE__, __LINE__); - rc = ENODEV; - goto bce_attach_fail; - } - /* * The embedded PCIe to PCI-X bridge (EPB) * in the 5708 cannot address memory above @@ -742,20 +735,13 @@ IFQ_SET_MAXLEN(&ifp->if_snd, ifp->if_snd.ifq_drv_maxlen); IFQ_SET_READY(&ifp->if_snd); - if (sc->bce_phy_flags & BCE_PHY_SERDES_FLAG) { - BCE_PRINTF(sc, "%s(%d): SerDes is not supported by this driver!\n", + /* Look for our PHY. */ + if (mii_phy_probe(dev, &sc->bce_miibus, bce_ifmedia_upd, + bce_ifmedia_sts)) { + BCE_PRINTF(sc, "%s(%d): PHY probe failed!\n", __FILE__, __LINE__); - rc = ENODEV; + rc = ENXIO; goto bce_attach_fail; - } else { - /* Look for our PHY. */ - if (mii_phy_probe(dev, &sc->bce_miibus, bce_ifmedia_upd, - bce_ifmedia_sts)) { - BCE_PRINTF(sc, "%s(%d): PHY probe failed!\n", - __FILE__, __LINE__); - rc = ENXIO; - goto bce_attach_fail; - } } /* Attach to the Ethernet interface list. */ @@ -836,12 +822,8 @@ ether_ifdetach(ifp); /* If we have a child device on the MII bus remove it too. */ - if (sc->bce_phy_flags & BCE_PHY_SERDES_FLAG) { - ifmedia_removeall(&sc->bce_ifmedia); - } else { - bus_generic_detach(dev); - device_delete_child(dev, sc->bce_miibus); - } + bus_generic_detach(dev); + device_delete_child(dev, sc->bce_miibus); /* Release all remaining resources. */ bce_release_resources(sc); @@ -1118,7 +1100,8 @@ BCE_CLRBIT(sc, BCE_EMAC_MODE, BCE_EMAC_MODE_PORT); /* Set MII or GMII inerface based on the speed negotiated by the PHY. */ - if (IFM_SUBTYPE(mii->mii_media_active) == IFM_1000_T) { + if (IFM_SUBTYPE(mii->mii_media_active) == IFM_1000_T || + IFM_SUBTYPE(mii->mii_media_active) == IFM_1000_SX) { DBPRINT(sc, BCE_INFO, "Setting GMII interface.\n"); BCE_SETBIT(sc, BCE_EMAC_MODE, BCE_EMAC_MODE_PORT_GMII); } else { @@ -3832,8 +3815,6 @@ ifm = &sc->bce_ifmedia; BCE_LOCK_ASSERT(sc); - /* DRC - ToDo: Add SerDes support. */ - mii = device_get_softc(sc->bce_miibus); sc->bce_link = 0; if (mii->mii_instance) { @@ -3864,8 +3845,6 @@ mii = device_get_softc(sc->bce_miibus); - /* DRC - ToDo: Add SerDes support. */ - mii_pollstat(mii); ifmr->ifm_active = mii->mii_media_active; ifmr->ifm_status = mii->mii_media_status; @@ -4879,17 +4858,10 @@ DBPRINT(sc, BCE_VERBOSE, "bce_phy_flags = 0x%08X\n", sc->bce_phy_flags); - if (sc->bce_phy_flags & BCE_PHY_SERDES_FLAG) { - DBPRINT(sc, BCE_VERBOSE, "SerDes media set/get\n"); - - error = ifmedia_ioctl(ifp, ifr, - &sc->bce_ifmedia, command); - } else { - DBPRINT(sc, BCE_VERBOSE, "Copper media set/get\n"); - mii = device_get_softc(sc->bce_miibus); - error = ifmedia_ioctl(ifp, ifr, - &mii->mii_media, command); - } + DBPRINT(sc, BCE_VERBOSE, "Copper media set/get\n"); + mii = device_get_softc(sc->bce_miibus); + error = ifmedia_ioctl(ifp, ifr, + &mii->mii_media, command); break; /* Set interface capability */ @@ -5231,7 +5203,7 @@ { struct ifnet *ifp; struct ifmultiaddr *ifma; - u32 hashes[4] = { 0, 0, 0, 0 }; + u32 hashes[NUM_MC_HASH_REGISTERS] = { 0, 0, 0, 0, 0, 0, 0, 0 }; u32 rx_mode, sort_mode; int h, i; @@ -5279,12 +5251,12 @@ if (ifma->ifma_addr->sa_family != AF_LINK) continue; h = ether_crc32_le(LLADDR((struct sockaddr_dl *) - ifma->ifma_addr), ETHER_ADDR_LEN) & 0x7F; - hashes[(h & 0x60) >> 5] |= 1 << (h & 0x1F); + ifma->ifma_addr), ETHER_ADDR_LEN) & 0xFF; + hashes[(h & 0xE0) >> 5] |= 1 << (h & 0x1F); } IF_ADDR_UNLOCK(ifp); - for (i = 0; i < 4; i++) + for (i = 0; i < NUM_MC_HASH_REGISTERS; i++) REG_WR(sc, BCE_EMAC_MULTICAST_HASH0 + (i * 4), hashes[i]); sort_mode |= BCE_RPM_SORT_USER0_MC_HSH_EN; @@ -5567,8 +5539,6 @@ if (sc->bce_link) goto bce_tick_locked_exit; - /* DRC - ToDo: Add SerDes support and check SerDes link here. */ - mii = device_get_softc(sc->bce_miibus); mii_tick(mii); ==== //depot/projects/linuxolator/src/sys/dev/esp/esp_sbus.c#3 (text+ko) ==== @@ -65,7 +65,7 @@ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 27 13:39:21 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1B9C16A410; Sat, 27 Jan 2007 13:39:21 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 878FC16A40E for ; Sat, 27 Jan 2007 13:39:21 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6BD6713C4B8 for ; Sat, 27 Jan 2007 13:39:21 +0000 (UTC) (envelope-from als@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0RDdLG0069491 for ; Sat, 27 Jan 2007 13:39:21 GMT (envelope-from als@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0RDdFuQ069468 for perforce@freebsd.org; Sat, 27 Jan 2007 13:39:15 GMT (envelope-from als@FreeBSD.org) Date: Sat, 27 Jan 2007 13:39:15 GMT Message-Id: <200701271339.l0RDdFuQ069468@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to als@FreeBSD.org using -f From: Alex Lyashkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 113597 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Jan 2007 13:39:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=113597 Change 113597 by als@als_head on 2007/01/27 13:38:39 update to HEAD. Affected files ... .. //depot/projects/jail2/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/jail2/sys/amd64/amd64/machdep.c#10 integrate .. //depot/projects/jail2/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/jail2/sys/amd64/amd64/mptable_pci.c#4 integrate .. //depot/projects/jail2/sys/amd64/amd64/msi.c#2 integrate .. //depot/projects/jail2/sys/amd64/amd64/nexus.c#4 integrate .. //depot/projects/jail2/sys/amd64/include/clock.h#3 integrate .. //depot/projects/jail2/sys/amd64/include/intr_machdep.h#5 integrate .. //depot/projects/jail2/sys/amd64/include/md_var.h#3 integrate .. //depot/projects/jail2/sys/amd64/include/setjmp.h#2 integrate .. //depot/projects/jail2/sys/amd64/include/specialreg.h#3 integrate .. //depot/projects/jail2/sys/amd64/isa/clock.c#4 integrate .. //depot/projects/jail2/sys/amd64/linux32/linux32_machdep.c#8 integrate .. //depot/projects/jail2/sys/amd64/pci/pci_bus.c#4 integrate .. //depot/projects/jail2/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/jail2/sys/arm/arm/vm_machdep.c#5 integrate .. //depot/projects/jail2/sys/arm/at91/uart_dev_at91usart.c#4 integrate .. //depot/projects/jail2/sys/arm/include/bus_dma.h#2 integrate .. //depot/projects/jail2/sys/arm/include/md_var.h#2 integrate .. //depot/projects/jail2/sys/arm/include/pmap.h#5 integrate .. //depot/projects/jail2/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate .. //depot/projects/jail2/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/jail2/sys/arm/xscale/ixp425/ixp425.c#2 integrate .. //depot/projects/jail2/sys/arm/xscale/ixp425/ixp425_mem.c#2 integrate .. //depot/projects/jail2/sys/arm/xscale/ixp425/ixp425_pci.c#2 integrate .. //depot/projects/jail2/sys/arm/xscale/ixp425/ixp425var.h#2 integrate .. //depot/projects/jail2/sys/boot/common/pnp.c#2 integrate .. //depot/projects/jail2/sys/boot/common/pnpdata#2 delete .. //depot/projects/jail2/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/jail2/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/jail2/sys/compat/linprocfs/linprocfs.c#6 integrate .. //depot/projects/jail2/sys/compat/linux/linux_emul.c#6 integrate .. //depot/projects/jail2/sys/compat/linux/linux_emul.h#4 integrate .. //depot/projects/jail2/sys/compat/linux/linux_file.c#6 integrate .. //depot/projects/jail2/sys/compat/linux/linux_ipc.c#5 integrate .. //depot/projects/jail2/sys/compat/linux/linux_mib.c#4 integrate .. //depot/projects/jail2/sys/compat/linux/linux_misc.c#11 integrate .. //depot/projects/jail2/sys/compat/linux/linux_signal.c#5 integrate .. //depot/projects/jail2/sys/conf/NOTES#11 integrate .. //depot/projects/jail2/sys/conf/files.sparc64#4 integrate .. //depot/projects/jail2/sys/conf/options#10 integrate .. //depot/projects/jail2/sys/conf/options.sun4v#2 integrate .. //depot/projects/jail2/sys/ddb/db_command.c#5 integrate .. //depot/projects/jail2/sys/ddb/db_thread.c#3 integrate .. //depot/projects/jail2/sys/dev/aac/aac_cam.c#4 integrate .. //depot/projects/jail2/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/jail2/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/jail2/sys/dev/acpica/acpi_package.c#2 integrate .. //depot/projects/jail2/sys/dev/acpica/acpi_pcib_acpi.c#4 integrate .. //depot/projects/jail2/sys/dev/acpica/acpi_pcib_pci.c#3 integrate .. //depot/projects/jail2/sys/dev/acpica/acpi_perf.c#3 integrate .. //depot/projects/jail2/sys/dev/acpica/acpi_throttle.c#2 integrate .. //depot/projects/jail2/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/jail2/sys/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/jail2/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/ath/ath_rate/sample/sample.c#3 integrate .. //depot/projects/jail2/sys/dev/ath/ath_rate/sample/sample.h#4 integrate .. //depot/projects/jail2/sys/dev/ath/if_ath.c#7 integrate .. //depot/projects/jail2/sys/dev/ath/if_ath_pci.c#3 integrate .. //depot/projects/jail2/sys/dev/ath/if_athvar.h#7 integrate .. //depot/projects/jail2/sys/dev/bce/if_bce.c#8 integrate .. //depot/projects/jail2/sys/dev/bce/if_bcereg.h#4 integrate .. //depot/projects/jail2/sys/dev/bge/if_bge.c#10 integrate .. //depot/projects/jail2/sys/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/jail2/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/jail2/sys/dev/cy/cy_isa.c#2 integrate .. //depot/projects/jail2/sys/dev/dpt/dpt.h#2 integrate .. //depot/projects/jail2/sys/dev/dpt/dpt_eisa.c#3 integrate .. //depot/projects/jail2/sys/dev/dpt/dpt_scsi.c#4 integrate .. //depot/projects/jail2/sys/dev/esp/esp_sbus.c#3 integrate .. //depot/projects/jail2/sys/dev/fb/boot_font.c#2 integrate .. //depot/projects/jail2/sys/dev/fb/creator.c#3 integrate .. //depot/projects/jail2/sys/dev/fb/creatorreg.h#1 branch .. //depot/projects/jail2/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/jail2/sys/dev/fb/gallant12x22.c#1 branch .. //depot/projects/jail2/sys/dev/fb/gfb.c#2 delete .. //depot/projects/jail2/sys/dev/fb/gfb.h#2 integrate .. //depot/projects/jail2/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/jail2/sys/dev/gfb/gfb_pci.c#2 delete .. //depot/projects/jail2/sys/dev/gfb/gfb_pci.h#2 delete .. //depot/projects/jail2/sys/dev/ichsmb/ichsmb.c#3 integrate .. //depot/projects/jail2/sys/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/idt/idtreg.h#2 integrate .. //depot/projects/jail2/sys/dev/isp/isp.c#7 integrate .. //depot/projects/jail2/sys/dev/isp/isp_freebsd.c#8 integrate .. //depot/projects/jail2/sys/dev/isp/isp_freebsd.h#8 integrate .. //depot/projects/jail2/sys/dev/isp/isp_pci.c#8 integrate .. //depot/projects/jail2/sys/dev/isp/isp_sbus.c#6 integrate .. //depot/projects/jail2/sys/dev/isp/isp_target.c#5 integrate .. //depot/projects/jail2/sys/dev/isp/isp_target.h#4 integrate .. //depot/projects/jail2/sys/dev/isp/isp_tpublic.h#4 integrate .. //depot/projects/jail2/sys/dev/isp/ispvar.h#6 integrate .. //depot/projects/jail2/sys/dev/le/if_le_cbus.c#2 integrate .. //depot/projects/jail2/sys/dev/le/if_le_isa.c#2 integrate .. //depot/projects/jail2/sys/dev/le/if_le_lebuffer.c#1 branch .. //depot/projects/jail2/sys/dev/le/if_le_ledma.c#2 integrate .. //depot/projects/jail2/sys/dev/le/if_le_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/le/lance.c#3 integrate .. //depot/projects/jail2/sys/dev/le/lebuffer_sbus.c#1 branch .. //depot/projects/jail2/sys/dev/mc146818/mc146818reg.h#2 integrate .. //depot/projects/jail2/sys/dev/mfi/mfi_pci.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/acphy.c#4 integrate .. //depot/projects/jail2/sys/dev/mii/acphyreg.h#2 integrate .. //depot/projects/jail2/sys/dev/mii/amphy.c#4 integrate .. //depot/projects/jail2/sys/dev/mii/brgphy.c#6 integrate .. //depot/projects/jail2/sys/dev/mii/exphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/gentbi.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/inphy.c#4 integrate .. //depot/projects/jail2/sys/dev/mii/lxtphy.c#4 integrate .. //depot/projects/jail2/sys/dev/mii/mii.c#2 integrate .. //depot/projects/jail2/sys/dev/mii/mii_physubr.c#4 integrate .. //depot/projects/jail2/sys/dev/mii/miidevs#5 integrate .. //depot/projects/jail2/sys/dev/mii/miivar.h#3 integrate .. //depot/projects/jail2/sys/dev/mii/nsphy.c#4 integrate .. //depot/projects/jail2/sys/dev/mii/rlphy.c#4 integrate .. //depot/projects/jail2/sys/dev/mii/ruephy.c#3 integrate .. //depot/projects/jail2/sys/dev/mii/ukphy.c#3 integrate .. //depot/projects/jail2/sys/dev/mpt/mpt_cam.c#9 integrate .. //depot/projects/jail2/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/jail2/sys/dev/pci/pci.c#8 integrate .. //depot/projects/jail2/sys/dev/pci/pci_if.m#4 integrate .. //depot/projects/jail2/sys/dev/pci/pci_pci.c#4 integrate .. //depot/projects/jail2/sys/dev/pci/pci_private.h#6 integrate .. //depot/projects/jail2/sys/dev/pci/pcib_if.m#4 integrate .. //depot/projects/jail2/sys/dev/pci/pcib_private.h#4 integrate .. //depot/projects/jail2/sys/dev/pci/pcireg.h#4 integrate .. //depot/projects/jail2/sys/dev/pci/pcivar.h#6 integrate .. //depot/projects/jail2/sys/dev/re/if_re.c#7 integrate .. //depot/projects/jail2/sys/dev/si/si.c#3 integrate .. //depot/projects/jail2/sys/dev/sk/if_sk.c#5 integrate .. //depot/projects/jail2/sys/dev/sound/pci/es137x.c#4 integrate .. //depot/projects/jail2/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/jail2/sys/dev/sound/pci/hda/hdac_private.h#3 integrate .. //depot/projects/jail2/sys/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/jail2/sys/dev/sound/sbus/cs4231.c#2 integrate .. //depot/projects/jail2/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/jail2/sys/dev/sound/usb/uaudio_pcm.c#3 integrate .. //depot/projects/jail2/sys/dev/stge/if_stge.c#3 integrate .. //depot/projects/jail2/sys/dev/sym/sym_hipd.c#3 integrate .. //depot/projects/jail2/sys/dev/syscons/scvesactl.c#2 integrate .. //depot/projects/jail2/sys/dev/ti/if_ti.c#4 integrate .. //depot/projects/jail2/sys/dev/uart/uart_cpu.h#2 integrate .. //depot/projects/jail2/sys/dev/uart/uart_dev_ns8250.c#2 integrate .. //depot/projects/jail2/sys/dev/uart/uart_dev_sab82532.c#2 integrate .. //depot/projects/jail2/sys/dev/uart/uart_dev_z8530.c#3 integrate .. //depot/projects/jail2/sys/dev/uart/uart_kbd_sun.c#5 integrate .. //depot/projects/jail2/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/jail2/sys/dev/usb/if_aue.c#6 integrate .. //depot/projects/jail2/sys/dev/usb/if_auereg.h#3 integrate .. //depot/projects/jail2/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/jail2/sys/dev/usb/ums.c#3 integrate .. //depot/projects/jail2/sys/dev/usb/usb_ethersubr.c#4 integrate .. //depot/projects/jail2/sys/dev/usb/usb_ethersubr.h#3 integrate .. //depot/projects/jail2/sys/fs/deadfs/dead_vnops.c#2 integrate .. //depot/projects/jail2/sys/fs/msdosfs/denode.h#4 integrate .. //depot/projects/jail2/sys/fs/msdosfs/msdosfs_fat.c#2 integrate .. //depot/projects/jail2/sys/fs/udf/udf_vfsops.c#6 integrate .. //depot/projects/jail2/sys/fs/udf/udf_vnops.c#3 integrate .. //depot/projects/jail2/sys/geom/geom_vfs.c#2 integrate .. //depot/projects/jail2/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/jail2/sys/i386/cpufreq/powernow.c#2 integrate .. //depot/projects/jail2/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/jail2/sys/i386/i386/machdep.c#9 integrate .. //depot/projects/jail2/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/jail2/sys/i386/i386/mptable_pci.c#4 integrate .. //depot/projects/jail2/sys/i386/i386/msi.c#2 integrate .. //depot/projects/jail2/sys/i386/i386/nexus.c#4 integrate .. //depot/projects/jail2/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/jail2/sys/i386/ibcs2/ibcs2_sysvec.c#3 integrate .. //depot/projects/jail2/sys/i386/include/clock.h#3 integrate .. //depot/projects/jail2/sys/i386/include/intr_machdep.h#5 integrate .. //depot/projects/jail2/sys/i386/include/setjmp.h#2 integrate .. //depot/projects/jail2/sys/i386/include/specialreg.h#4 integrate .. //depot/projects/jail2/sys/i386/isa/clock.c#5 integrate .. //depot/projects/jail2/sys/i386/linux/linux_machdep.c#7 integrate .. //depot/projects/jail2/sys/i386/pci/pci_bus.c#4 integrate .. //depot/projects/jail2/sys/ia64/include/exec.h#2 integrate .. //depot/projects/jail2/sys/ia64/include/floatingpoint.h#2 integrate .. //depot/projects/jail2/sys/ia64/include/reloc.h#2 integrate .. //depot/projects/jail2/sys/kern/imgact_elf.c#4 integrate .. //depot/projects/jail2/sys/kern/init_main.c#8 integrate .. //depot/projects/jail2/sys/kern/kern_acct.c#5 integrate .. //depot/projects/jail2/sys/kern/kern_acl.c#4 integrate .. //depot/projects/jail2/sys/kern/kern_descrip.c#11 integrate .. //depot/projects/jail2/sys/kern/kern_fork.c#7 integrate .. //depot/projects/jail2/sys/kern/kern_idle.c#5 integrate .. //depot/projects/jail2/sys/kern/kern_intr.c#5 integrate .. //depot/projects/jail2/sys/kern/kern_kse.c#4 integrate .. //depot/projects/jail2/sys/kern/kern_kthread.c#2 integrate .. //depot/projects/jail2/sys/kern/kern_ktrace.c#7 integrate .. //depot/projects/jail2/sys/kern/kern_mbuf.c#4 integrate .. //depot/projects/jail2/sys/kern/kern_ntptime.c#3 integrate .. //depot/projects/jail2/sys/kern/kern_prot.c#7 integrate .. //depot/projects/jail2/sys/kern/kern_resource.c#9 integrate .. //depot/projects/jail2/sys/kern/kern_sig.c#7 integrate .. //depot/projects/jail2/sys/kern/kern_subr.c#5 integrate .. //depot/projects/jail2/sys/kern/kern_switch.c#4 integrate .. //depot/projects/jail2/sys/kern/kern_thr.c#9 integrate .. //depot/projects/jail2/sys/kern/sched_4bsd.c#7 integrate .. //depot/projects/jail2/sys/kern/sched_core.c#5 integrate .. //depot/projects/jail2/sys/kern/sched_ule.c#6 integrate .. //depot/projects/jail2/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/jail2/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/jail2/sys/kern/subr_witness.c#6 integrate .. //depot/projects/jail2/sys/kern/tty_pts.c#5 integrate .. //depot/projects/jail2/sys/kern/uipc_mbuf.c#5 integrate .. //depot/projects/jail2/sys/kern/uipc_socket.c#10 integrate .. //depot/projects/jail2/sys/kern/uipc_syscalls.c#7 integrate .. //depot/projects/jail2/sys/kern/uipc_usrreq.c#8 integrate .. //depot/projects/jail2/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/jail2/sys/kern/vfs_export.c#4 integrate .. //depot/projects/jail2/sys/kern/vfs_lookup.c#5 integrate .. //depot/projects/jail2/sys/modules/le/Makefile#2 integrate .. //depot/projects/jail2/sys/modules/sound/driver/emu10kx/Makefile#3 integrate .. //depot/projects/jail2/sys/net/bridgestp.c#7 integrate .. //depot/projects/jail2/sys/net80211/_ieee80211.h#3 integrate .. //depot/projects/jail2/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/jail2/sys/net80211/ieee80211_freebsd.c#3 integrate .. //depot/projects/jail2/sys/net80211/ieee80211_freebsd.h#3 integrate .. //depot/projects/jail2/sys/net80211/ieee80211_input.c#5 integrate .. //depot/projects/jail2/sys/net80211/ieee80211_node.c#3 integrate .. //depot/projects/jail2/sys/net80211/ieee80211_proto.c#4 integrate .. //depot/projects/jail2/sys/net80211/ieee80211_proto.h#3 integrate .. //depot/projects/jail2/sys/netatalk/COPYRIGHT#2 integrate .. //depot/projects/jail2/sys/netatalk/aarp.c#3 integrate .. //depot/projects/jail2/sys/netatalk/aarp.h#2 integrate .. //depot/projects/jail2/sys/netatalk/at.h#2 integrate .. //depot/projects/jail2/sys/netatalk/at_extern.h#2 integrate .. //depot/projects/jail2/sys/netatalk/at_proto.c#2 integrate .. //depot/projects/jail2/sys/netatalk/at_rmx.c#2 integrate .. //depot/projects/jail2/sys/netatalk/at_var.h#2 integrate .. //depot/projects/jail2/sys/netatalk/ddp.h#2 integrate .. //depot/projects/jail2/sys/netatalk/ddp_input.c#3 integrate .. //depot/projects/jail2/sys/netatalk/ddp_output.c#3 integrate .. //depot/projects/jail2/sys/netatalk/ddp_pcb.c#4 integrate .. //depot/projects/jail2/sys/netatalk/ddp_pcb.h#2 integrate .. //depot/projects/jail2/sys/netatalk/ddp_usrreq.c#3 integrate .. //depot/projects/jail2/sys/netatalk/ddp_var.h#2 integrate .. //depot/projects/jail2/sys/netgraph/ng_deflate.c#2 integrate .. //depot/projects/jail2/sys/netgraph/ng_ppp.c#3 integrate .. //depot/projects/jail2/sys/netgraph/ng_pred1.c#2 integrate .. //depot/projects/jail2/sys/netgraph/ng_tcpmss.c#2 integrate .. //depot/projects/jail2/sys/netinet/if_ether.c#6 integrate .. //depot/projects/jail2/sys/netinet/ip.h#2 integrate .. //depot/projects/jail2/sys/netinet/ip_carp.c#5 integrate .. //depot/projects/jail2/sys/netinet/ip_fw2.c#11 integrate .. //depot/projects/jail2/sys/netinet/sctp_asconf.c#4 integrate .. //depot/projects/jail2/sys/netinet/sctp_asconf.h#3 integrate .. //depot/projects/jail2/sys/netinet/sctp_auth.c#3 integrate .. //depot/projects/jail2/sys/netinet/sctp_bsd_addr.c#4 integrate .. //depot/projects/jail2/sys/netinet/sctp_bsd_addr.h#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_constants.h#4 integrate .. //depot/projects/jail2/sys/netinet/sctp_crc32.c#3 integrate .. //depot/projects/jail2/sys/netinet/sctp_crc32.h#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_indata.c#5 integrate .. //depot/projects/jail2/sys/netinet/sctp_indata.h#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_input.c#5 integrate .. //depot/projects/jail2/sys/netinet/sctp_input.h#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_os.h#3 integrate .. //depot/projects/jail2/sys/netinet/sctp_os_bsd.h#3 integrate .. //depot/projects/jail2/sys/netinet/sctp_output.c#5 integrate .. //depot/projects/jail2/sys/netinet/sctp_output.h#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_pcb.c#4 integrate .. //depot/projects/jail2/sys/netinet/sctp_pcb.h#3 integrate .. //depot/projects/jail2/sys/netinet/sctp_peeloff.c#3 integrate .. //depot/projects/jail2/sys/netinet/sctp_peeloff.h#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_structs.h#4 integrate .. //depot/projects/jail2/sys/netinet/sctp_timer.c#4 integrate .. //depot/projects/jail2/sys/netinet/sctp_timer.h#2 integrate .. //depot/projects/jail2/sys/netinet/sctp_uio.h#5 integrate .. //depot/projects/jail2/sys/netinet/sctp_usrreq.c#5 integrate .. //depot/projects/jail2/sys/netinet/sctp_var.h#3 integrate .. //depot/projects/jail2/sys/netinet/sctputil.c#5 integrate .. //depot/projects/jail2/sys/netinet/sctputil.h#5 integrate .. //depot/projects/jail2/sys/netinet6/esp_aesctr.c#3 integrate .. //depot/projects/jail2/sys/netinet6/icmp6.c#6 integrate .. //depot/projects/jail2/sys/netinet6/in6_cksum.c#3 integrate .. //depot/projects/jail2/sys/netinet6/nd6.c#8 integrate .. //depot/projects/jail2/sys/netinet6/sctp6_usrreq.c#4 integrate .. //depot/projects/jail2/sys/netinet6/sctp6_var.h#2 integrate .. //depot/projects/jail2/sys/netipx/ipx.c#2 integrate .. //depot/projects/jail2/sys/netipx/ipx.h#2 integrate .. //depot/projects/jail2/sys/netipx/ipx_cksum.c#2 integrate .. //depot/projects/jail2/sys/netipx/ipx_if.h#2 integrate .. //depot/projects/jail2/sys/netipx/ipx_input.c#2 integrate .. //depot/projects/jail2/sys/netipx/ipx_ip.c#2 integrate .. //depot/projects/jail2/sys/netipx/ipx_ip.h#2 integrate .. //depot/projects/jail2/sys/netipx/ipx_outputfl.c#2 integrate .. //depot/projects/jail2/sys/netipx/ipx_pcb.c#3 integrate .. //depot/projects/jail2/sys/netipx/ipx_pcb.h#2 integrate .. //depot/projects/jail2/sys/netipx/ipx_proto.c#2 integrate .. //depot/projects/jail2/sys/netipx/ipx_usrreq.c#4 integrate .. //depot/projects/jail2/sys/netipx/ipx_var.h#2 integrate .. //depot/projects/jail2/sys/netipx/spx.h#2 integrate .. //depot/projects/jail2/sys/netipx/spx_debug.c#2 integrate .. //depot/projects/jail2/sys/netipx/spx_debug.h#2 integrate .. //depot/projects/jail2/sys/netipx/spx_timer.h#2 integrate .. //depot/projects/jail2/sys/netipx/spx_usrreq.c#3 integrate .. //depot/projects/jail2/sys/netipx/spx_var.h#2 integrate .. //depot/projects/jail2/sys/netnatm/natm.c#3 integrate .. //depot/projects/jail2/sys/netnatm/natm.h#2 integrate .. //depot/projects/jail2/sys/netnatm/natm_pcb.c#2 integrate .. //depot/projects/jail2/sys/netnatm/natm_proto.c#2 integrate .. //depot/projects/jail2/sys/nfs4client/nfs4_vfs_subs.c#2 integrate .. //depot/projects/jail2/sys/nfs4client/nfs4_vfsops.c#3 integrate .. //depot/projects/jail2/sys/nfs4client/nfs4_vnops.c#4 integrate .. //depot/projects/jail2/sys/nfsclient/nfs.h#4 integrate .. //depot/projects/jail2/sys/nfsclient/nfs_vfsops.c#7 integrate .. //depot/projects/jail2/sys/nfsclient/nfs_vnops.c#7 integrate .. //depot/projects/jail2/sys/pc98/cbus/clock.c#3 integrate .. //depot/projects/jail2/sys/pc98/pc98/machdep.c#8 integrate .. //depot/projects/jail2/sys/pci/alpm.c#3 integrate .. //depot/projects/jail2/sys/pci/amdpm.c#3 integrate .. //depot/projects/jail2/sys/pci/amdsmb.c#3 integrate .. //depot/projects/jail2/sys/pci/if_pcn.c#4 integrate .. //depot/projects/jail2/sys/pci/if_rl.c#4 integrate .. //depot/projects/jail2/sys/pci/if_rlreg.h#6 integrate .. //depot/projects/jail2/sys/pci/intpm.c#3 integrate .. //depot/projects/jail2/sys/pci/intpmreg.h#3 integrate .. //depot/projects/jail2/sys/pci/nfsmb.c#5 integrate .. //depot/projects/jail2/sys/pci/viapm.c#3 integrate .. //depot/projects/jail2/sys/powerpc/conf/NOTES#4 integrate .. //depot/projects/jail2/sys/powerpc/include/ipl.h#2 delete .. //depot/projects/jail2/sys/powerpc/include/reloc.h#2 integrate .. //depot/projects/jail2/sys/powerpc/powerpc/cpu.c#2 integrate .. //depot/projects/jail2/sys/powerpc/powerpc/machdep.c#5 integrate .. //depot/projects/jail2/sys/sparc64/creator/creator.h#2 delete .. //depot/projects/jail2/sys/sparc64/creator/creator_upa.c#2 delete .. //depot/projects/jail2/sys/sparc64/include/bus.h#2 integrate .. //depot/projects/jail2/sys/sparc64/include/cache.h#2 integrate .. //depot/projects/jail2/sys/sparc64/include/frame.h#2 integrate .. //depot/projects/jail2/sys/sparc64/include/fsr.h#2 integrate .. //depot/projects/jail2/sys/sparc64/include/intr_machdep.h#2 integrate .. //depot/projects/jail2/sys/sparc64/include/ofw_nexus.h#1 branch .. //depot/projects/jail2/sys/sparc64/include/pcb.h#2 integrate .. //depot/projects/jail2/sys/sparc64/include/reloc.h#2 integrate .. //depot/projects/jail2/sys/sparc64/include/setjmp.h#2 integrate .. //depot/projects/jail2/sys/sparc64/include/tsb.h#2 integrate .. //depot/projects/jail2/sys/sparc64/isa/isa.c#2 integrate .. //depot/projects/jail2/sys/sparc64/pci/ofw_pci_if.m#2 integrate .. //depot/projects/jail2/sys/sparc64/pci/ofw_pcibus.c#3 integrate .. //depot/projects/jail2/sys/sparc64/pci/psycho.c#2 integrate .. //depot/projects/jail2/sys/sparc64/pci/psychoreg.h#2 integrate .. //depot/projects/jail2/sys/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/projects/jail2/sys/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/jail2/sys/sparc64/sparc64/bus_machdep.c#2 integrate .. //depot/projects/jail2/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/jail2/sys/sparc64/sparc64/genassym.c#5 integrate .. //depot/projects/jail2/sys/sparc64/sparc64/interrupt.S#2 integrate .. //depot/projects/jail2/sys/sparc64/sparc64/mp_exception.S#2 integrate .. //depot/projects/jail2/sys/sparc64/sparc64/mp_locore.S#2 integrate .. //depot/projects/jail2/sys/sparc64/sparc64/ofw_machdep.c#2 integrate .. //depot/projects/jail2/sys/sparc64/sparc64/support.S#4 integrate .. //depot/projects/jail2/sys/sparc64/sparc64/swtch.S#2 integrate .. //depot/projects/jail2/sys/sparc64/sparc64/upa.c#1 branch .. //depot/projects/jail2/sys/sun4v/include/bus.h#2 integrate .. //depot/projects/jail2/sys/sun4v/include/frame.h#2 integrate .. //depot/projects/jail2/sys/sun4v/include/fsr.h#2 integrate .. //depot/projects/jail2/sys/sun4v/include/intr_machdep.h#2 integrate .. //depot/projects/jail2/sys/sun4v/include/pcb.h#3 integrate .. //depot/projects/jail2/sys/sun4v/include/reloc.h#2 integrate .. //depot/projects/jail2/sys/sun4v/include/setjmp.h#2 integrate .. //depot/projects/jail2/sys/sun4v/include/utrap.h#3 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/bus_machdep.c#2 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/exception.S#5 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/hv_pci.c#3 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/interrupt.S#5 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/mp_locore.S#3 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/support.S#5 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/swtch.S#2 integrate .. //depot/projects/jail2/sys/sun4v/sun4v/wbuf.S#4 integrate .. //depot/projects/jail2/sys/sys/buf.h#3 integrate .. //depot/projects/jail2/sys/sys/bufobj.h#3 integrate .. //depot/projects/jail2/sys/sys/copyright.h#4 integrate .. //depot/projects/jail2/sys/sys/mbuf.h#7 integrate .. //depot/projects/jail2/sys/sys/param.h#9 integrate .. //depot/projects/jail2/sys/sys/priority.h#2 integrate .. //depot/projects/jail2/sys/sys/proc.h#7 integrate .. //depot/projects/jail2/sys/sys/rtprio.h#5 integrate .. //depot/projects/jail2/sys/sys/sched.h#6 integrate .. //depot/projects/jail2/sys/sys/systm.h#9 integrate .. //depot/projects/jail2/sys/ufs/ffs/ffs_alloc.c#4 integrate .. //depot/projects/jail2/sys/ufs/ffs/ffs_extern.h#3 integrate .. //depot/projects/jail2/sys/ufs/ffs/ffs_snapshot.c#5 integrate .. //depot/projects/jail2/sys/ufs/ffs/ffs_vfsops.c#6 integrate .. //depot/projects/jail2/sys/ufs/ufs/quota.h#2 integrate .. //depot/projects/jail2/sys/ufs/ufs/ufs_acl.c#2 integrate .. //depot/projects/jail2/sys/ufs/ufs/ufs_quota.c#5 integrate .. //depot/projects/jail2/sys/ufs/ufs/ufs_vnops.c#7 integrate .. //depot/projects/jail2/sys/vm/uma.h#3 integrate .. //depot/projects/jail2/sys/vm/uma_core.c#5 integrate .. //depot/projects/jail2/sys/vm/vm_glue.c#4 integrate .. //depot/projects/jail2/sys/vm/vm_object.c#7 integrate .. //depot/projects/jail2/sys/vm/vm_pageout.c#5 integrate .. //depot/projects/jail2/sys/vm/vm_zeroidle.c#5 integrate Differences ... ==== //depot/projects/jail2/sys/amd64/amd64/identcpu.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.148 2006/08/01 01:23:39 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.149 2007/01/09 19:23:21 jkim Exp $"); #include "opt_cpu.h" @@ -228,8 +228,8 @@ "\007" "\010EST" /* Enhanced SpeedStep */ "\011TM2" /* Thermal Monitor 2 */ - "\012" - "\013CNTX-ID" /* L1 context ID available */ + "\012SSSE3" /* SSSE3 */ + "\013CNXT-ID" /* L1 context ID available */ "\014" "\015" "\016CX16" /* CMPXCHG16B Instruction */ ==== //depot/projects/jail2/sys/amd64/amd64/machdep.c#10 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.667 2006/12/20 04:40:38 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.668 2007/01/23 08:01:19 bde Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -1176,7 +1176,6 @@ * under witness. */ mutex_init(); - mtx_init(&clock_lock, "clk", NULL, MTX_SPIN); mtx_init(&icu_lock, "icu", NULL, MTX_SPIN | MTX_NOWITNESS); /* exceptions */ @@ -1207,6 +1206,12 @@ lidt(&r_idt); /* + * Initialize the i8254 before the console so that console + * initialization can use DELAY(). + */ + i8254_init(); + + /* * Initialize the console before we print anything out. */ cninit(); ==== //depot/projects/jail2/sys/amd64/amd64/mp_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.278 2006/10/10 23:23:11 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.280 2007/01/23 08:38:39 jeff Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -948,20 +948,15 @@ ipi_bitmap = atomic_readandclear_int(&cpu_ipi_pending[cpu]); -#ifdef IPI_PREEMPTION - if (ipi_bitmap & IPI_PREEMPT) { + if (ipi_bitmap & (1 << IPI_PREEMPT)) { + struct thread *running_thread = curthread; mtx_lock_spin(&sched_lock); - /* Don't preempt the idle thread */ - if (curthread->td_priority < PRI_MIN_IDLE) { - struct thread *running_thread = curthread; - if (running_thread->td_critnest > 1) - running_thread->td_owepreempt = 1; - else - mi_switch(SW_INVOL | SW_PREEMPT, NULL); - } + if (running_thread->td_critnest > 1) + running_thread->td_owepreempt = 1; + else + mi_switch(SW_INVOL | SW_PREEMPT, NULL); mtx_unlock_spin(&sched_lock); } -#endif /* Nothing to do for AST */ } ==== //depot/projects/jail2/sys/amd64/amd64/mptable_pci.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.6 2006/12/12 19:27:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.7 2007/01/22 21:48:42 jhb Exp $"); #include #include @@ -120,6 +120,7 @@ DEVMETHOD(pcib_alloc_msi, mptable_hostb_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), DEVMETHOD(pcib_alloc_msix, mptable_hostb_alloc_msix), + DEVMETHOD(pcib_remap_msix, pcib_remap_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), { 0, 0 } @@ -176,6 +177,7 @@ DEVMETHOD(pcib_alloc_msi, pcib_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), DEVMETHOD(pcib_alloc_msix, pcib_alloc_msix), + DEVMETHOD(pcib_remap_msix, pcib_remap_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), {0, 0} ==== //depot/projects/jail2/sys/amd64/amd64/msi.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.2 2006/11/15 18:40:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.3 2007/01/22 21:48:42 jhb Exp $"); #include #include @@ -480,6 +480,30 @@ } int +msix_remap(int index, int irq) +{ + struct msi_intsrc *msi; + + sx_xlock(&msi_sx); + msi = (struct msi_intsrc *)intr_lookup_source(irq); + if (msi == NULL) { + sx_xunlock(&msi_sx); + return (ENOENT); + } + + /* Make sure this is an MSI-X message. */ + if (!msi->msi_msix) { + sx_xunlock(&msi_sx); + return (EINVAL); + } + + KASSERT(msi->msi_dev != NULL, ("unowned message")); + msi->msi_index = index; + sx_xunlock(&msi_sx); + return (0); +} + +int msix_release(int irq) { struct msi_intsrc *msi; ==== //depot/projects/jail2/sys/amd64/amd64/nexus.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.70 2006/11/13 22:23:32 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.72 2007/01/22 21:48:42 jhb Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -105,6 +105,7 @@ static int nexus_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, int *irqs); static int nexus_release_msi(device_t pcib, device_t dev, int count, int *irqs); static int nexus_alloc_msix(device_t pcib, device_t dev, int index, int *irq); +static int nexus_remap_msix(device_t pcib, device_t dev, int index, int irq); static int nexus_release_msix(device_t pcib, device_t dev, int irq); static device_method_t nexus_methods[] = { @@ -135,6 +136,7 @@ DEVMETHOD(pcib_alloc_msi, nexus_alloc_msi), DEVMETHOD(pcib_release_msi, nexus_release_msi), DEVMETHOD(pcib_alloc_msix, nexus_alloc_msix), + DEVMETHOD(pcib_remap_msix, nexus_remap_msix), DEVMETHOD(pcib_release_msix, nexus_release_msix), { 0, 0 } @@ -371,24 +373,9 @@ * If this is a memory resource, map it into the kernel. */ if (rman_get_bustag(r) == AMD64_BUS_SPACE_MEM) { - caddr_t vaddr = 0; + void *vaddr; - if (rman_get_end(r) < 1024 * 1024) { - /* - * The first 1Mb is mapped at KERNBASE. - */ - vaddr = (caddr_t)(uintptr_t)(KERNBASE + rman_get_start(r)); - } else { - u_int64_t paddr; - u_int64_t psize; - u_int32_t poffs; - - paddr = rman_get_start(r); - psize = rman_get_size(r); - - poffs = paddr - trunc_page(paddr); - vaddr = (caddr_t) pmap_mapdev(paddr-poffs, psize+poffs) + poffs; - } + vaddr = pmap_mapdev(rman_get_start(r), rman_get_size(r)); rman_set_virtual(r, vaddr); rman_set_bushandle(r, (bus_space_handle_t) vaddr); } @@ -402,12 +389,9 @@ /* * If this is a memory resource, unmap it. */ - if ((rman_get_bustag(r) == AMD64_BUS_SPACE_MEM) && - (rman_get_end(r) >= 1024 * 1024)) { - u_int32_t psize; - - psize = rman_get_size(r); - pmap_unmapdev((vm_offset_t)rman_get_virtual(r), psize); + if (rman_get_bustag(r) == AMD64_BUS_SPACE_MEM) { + pmap_unmapdev((vm_offset_t)rman_get_virtual(r), + rman_get_size(r)); } return (rman_deactivate_resource(r)); @@ -528,6 +512,13 @@ } static int +nexus_remap_msix(device_t pcib, device_t dev, int index, int irq) +{ + + return (msix_remap(index, irq)); +} + +static int nexus_release_msix(device_t pcib, device_t dev, int irq) { ==== //depot/projects/jail2/sys/amd64/include/clock.h#3 (text+ko) ==== @@ -3,7 +3,7 @@ * Garrett Wollman, September 1994. * This file is in the public domain. * - * $FreeBSD: src/sys/amd64/include/clock.h,v 1.53 2006/10/02 12:59:55 phk Exp $ + * $FreeBSD: src/sys/amd64/include/clock.h,v 1.54 2007/01/23 08:01:19 bde Exp $ */ #ifndef _MACHINE_CLOCK_H_ @@ -22,7 +22,8 @@ extern int timer0_max_count; extern uint64_t tsc_freq; extern int tsc_is_broken; -extern struct mtx clock_lock; + +void i8254_init(void); /* * Driver to clock driver interface. ==== //depot/projects/jail2/sys/amd64/include/intr_machdep.h#5 (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/amd64/include/intr_machdep.h,v 1.13 2006/12/12 19:24:45 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.14 2007/01/22 21:48:42 jhb Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -152,6 +152,7 @@ void msi_init(void); int msi_release(int *irqs, int count); int msix_alloc(device_t dev, int index, int *irq, int *new); +int msix_remap(int index, int irq); int msix_release(int irq); #endif /* !LOCORE */ ==== //depot/projects/jail2/sys/amd64/include/md_var.h#3 (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/include/md_var.h,v 1.78 2006/06/19 22:36:01 davidxu Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.80 2007/01/18 05:46:32 rodrigc Exp $ */ #ifndef _MACHINE_MD_VAR_H_ ==== //depot/projects/jail2/sys/amd64/include/setjmp.h#2 (text+ko) ==== @@ -10,10 +10,7 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by John Birrell. - * 4. Neither the name of the author nor the names of any co-contributors + * 3. Neither the name of the author nor the names of any co-contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -29,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/setjmp.h,v 1.9 2003/06/02 21:49:35 peter Exp $ + * $FreeBSD: src/sys/amd64/include/setjmp.h,v 1.10 2007/01/12 07:24:06 imp Exp $ */ #ifndef _MACHINE_SETJMP_H_ ==== //depot/projects/jail2/sys/amd64/include/specialreg.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.35 2006/07/13 16:09:40 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.36 2007/01/09 19:23:21 jkim Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -118,7 +118,8 @@ #define CPUID2_VMX 0x00000020 #define CPUID2_EST 0x00000080 #define CPUID2_TM2 0x00000100 -#define CPUID2_CNTXID 0x00000400 +#define CPUID2_SSSE3 0x00000200 +#define CPUID2_CNXTID 0x00000400 #define CPUID2_CX16 0x00002000 #define CPUID2_XTPR 0x00004000 ==== //depot/projects/jail2/sys/amd64/isa/clock.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.228 2006/12/03 03:49:28 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.229 2007/01/23 08:01:20 bde Exp $"); /* * Routines to handle clock hardware. @@ -103,11 +103,11 @@ u_int timer_freq = TIMER_FREQ; int timer0_max_count; int timer0_real_max_count; -struct mtx clock_lock; #define RTC_LOCK mtx_lock_spin(&clock_lock) #define RTC_UNLOCK mtx_unlock_spin(&clock_lock) static int beeping = 0; +static struct mtx clock_lock; static const u_char daysinmonth[] = {31,28,31,30,31,30,31,31,30,31,30,31}; static struct intsrc *i8254_intsrc; static u_int32_t i8254_lastcount; @@ -295,13 +295,6 @@ printf("DELAY(%d)...", n); #endif /* - * Guard against the timer being uninitialized if we are called - * early for console i/o. - */ - if (timer0_max_count == 0) - set_timer_freq(timer_freq, hz); - - /* * Read the counter first, so that the rest of the setup overhead is * counted. Guess the initial overhead is 20 usec (on most systems it * takes about 1.5 usec for each of the i/o's in getit(). The loop @@ -560,10 +553,15 @@ mtx_unlock_spin(&clock_lock); } -/* - * Initialize 8254 timer 0 early so that it can be used in DELAY(). - * XXX initialization of other timers is unintentionally left blank. - */ +/* This is separate from startrtclock() so that it can be called early. */ +void +i8254_init(void) +{ + + mtx_init(&clock_lock, "clk", NULL, MTX_SPIN); + set_timer_freq(timer_freq, hz); +} + void startrtclock() { @@ -572,7 +570,6 @@ writertc(RTC_STATUSA, rtc_statusa); writertc(RTC_STATUSB, RTCSB_24HR); - set_timer_freq(timer_freq, hz); freq = calibrate_clocks(); #ifdef CLK_CALIBRATION_LOOP if (bootverbose) { ==== //depot/projects/jail2/sys/amd64/linux32/linux32_machdep.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.24 2007/01/06 15:58:34 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.28 2007/01/23 08:46:49 jeff Exp $"); #include #include @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -453,14 +454,21 @@ linux_fork(struct thread *td, struct linux_fork_args *args) { int error; + struct proc *p2; + struct thread *td2; #ifdef DEBUG if (ldebug(fork)) printf(ARGS(fork, "")); #endif - if ((error = fork(td, (struct fork_args *)args)) != 0) + if ((error = fork1(td, RFFDG | RFPROC | RFSTOPPED, 0, &p2)) != 0) return (error); + + if (error == 0) { + td->td_retval[0] = p2->p_pid; + td->td_retval[1] = 0; + } if (td->td_retval[1] == 1) td->td_retval[0] = 0; @@ -468,6 +476,14 @@ if (error) return (error); + td2 = FIRST_THREAD_IN_PROC(p2); + + /* make it run */ + mtx_lock_spin(&sched_lock); + TD_SET_CAN_RUN(td2); + sched_add(td2, SRQ_BORING); + mtx_unlock_spin(&sched_lock); + return (0); } @@ -476,6 +492,7 @@ { int error; struct proc *p2; + struct thread *td2; #ifdef DEBUG if (ldebug(vfork)) @@ -483,7 +500,7 @@ #endif /* exclude RFPPWAIT */ - if ((error = fork1(td, RFFDG | RFPROC | RFMEM, 0, &p2)) != 0) + if ((error = fork1(td, RFFDG | RFPROC | RFMEM | RFSTOPPED, 0, &p2)) != 0) return (error); if (error == 0) { td->td_retval[0] = p2->p_pid; @@ -495,11 +512,25 @@ error = linux_proc_init(td, td->td_retval[0], 0); if (error) return (error); + + PROC_LOCK(p2); + p2->p_flag |= P_PPWAIT; + PROC_UNLOCK(p2); + + td2 = FIRST_THREAD_IN_PROC(p2); + + /* make it run */ + mtx_lock_spin(&sched_lock); + TD_SET_CAN_RUN(td2); + sched_add(td2, SRQ_BORING); + mtx_unlock_spin(&sched_lock); + /* wait for the children to exit, ie. emulate vfork */ PROC_LOCK(p2); while (p2->p_flag & P_PPWAIT) msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); PROC_UNLOCK(p2); + return (0); } @@ -564,7 +595,7 @@ /* create the emuldata */ error = linux_proc_init(td, p2->p_pid, args->flags); /* reference it - no need to check this */ - em = em_find(p2, EMUL_UNLOCKED); + em = em_find(p2, EMUL_DOLOCK); KASSERT(em != NULL, ("clone: emuldata not found.\n")); /* and adjust it */ if (args->flags & CLONE_PARENT_SETTID) { @@ -631,13 +662,18 @@ printf(LMSG("clone: successful rfork to %ld, stack %p sig = %d"), (long)p2->p_pid, args->stack, exit_signal); #endif + if (args->flags & CLONE_VFORK) { + PROC_LOCK(p2); + p2->p_flag |= P_PPWAIT; + PROC_UNLOCK(p2); + } /* * Make this runnable after we are finished with it. */ mtx_lock_spin(&sched_lock); TD_SET_CAN_RUN(td2); - setrunqueue(td2, SRQ_BORING); + sched_add(td2, SRQ_BORING); mtx_unlock_spin(&sched_lock); td->td_retval[0] = p2->p_pid; @@ -646,7 +682,6 @@ if (args->flags & CLONE_VFORK) { /* wait for the children to exit, ie. emulate vfork */ PROC_LOCK(p2); - p2->p_flag |= P_PPWAIT; while (p2->p_flag & P_PPWAIT) msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); PROC_UNLOCK(p2); ==== //depot/projects/jail2/sys/amd64/pci/pci_bus.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.119 2006/12/12 19:27:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.120 2007/01/22 21:48:42 jhb Exp $"); #include "opt_cpu.h" @@ -347,6 +347,7 @@ DEVMETHOD(pcib_alloc_msi, legacy_pcib_alloc_msi), DEVMETHOD(pcib_release_msi, pcib_release_msi), DEVMETHOD(pcib_alloc_msix, legacy_pcib_alloc_msix), + DEVMETHOD(pcib_remap_msix, pcib_remap_msix), DEVMETHOD(pcib_release_msix, pcib_release_msix), { 0, 0 } ==== //depot/projects/jail2/sys/arm/arm/busdma_machdep.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.27 2006/08/25 15:10:45 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.28 2007/01/17 00:53:05 cognet Exp $"); /* * MacPPC bus dma support routines @@ -48,6 +48,7 @@ #include #include #include +#include #include #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jan 27 15:01:03 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B996916A407; Sat, 27 Jan 2007 15:01:03 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 78D6016A402 for ; Sat, 27 Jan 2007 15:01:03 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D4A0713C46E for ; Sat, 27 Jan 2007 15:01:02 +0000 (UTC) (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 l0RF12aD083478 for ; Sat, 27 Jan 2007 15:01:02 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0RF12C3083473 for perforce@freebsd.org; Sat, 27 Jan 2007 15:01:02 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 27 Jan 2007 15:01:02 GMT Message-Id: <200701271501.l0RF12C3083473@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 113598 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Jan 2007 15:01:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=113598 Change 113598 by hselasky@hselasky_mini_itx on 2007/01/27 15:00:54 Make the isochronous end-of-transfer timestamp 16-bits in width. This simplifies the USB device drivers doing echo-cancelling for example. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ehci.c#25 edit .. //depot/projects/usb/src/sys/dev/usb/ohci.c#19 edit .. //depot/projects/usb/src/sys/dev/usb/uhci.c#21 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#27 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#32 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ehci.c#25 (text+ko) ==== @@ -2458,11 +2458,18 @@ DPRINTFN(5,("xfer=%p next=%d nframes=%d\n", xfer, xfer->pipe->isoc_next, xfer->nframes)); + /* get the current frame index */ + nframes = EOREAD4(sc, EHCI_FRINDEX) / 8; - if(((nframes - xfer->pipe->isoc_next) & - (EHCI_VIRTUAL_FRAMELIST_COUNT-1)) < xfer->nframes) - { + /* check if the frame index is within + * the window where the frames will be + * inserted + */ + buf_offset = (nframes - xfer->pipe->isoc_next) & + (EHCI_VIRTUAL_FRAMELIST_COUNT-1); + + if (buf_offset < xfer->nframes) { /* not in use yet, schedule it a few frames ahead */ /* data underflow */ xfer->pipe->isoc_next = (nframes + 3) & @@ -2470,7 +2477,21 @@ DPRINTFN(2,("start next=%d\n", xfer->pipe->isoc_next)); } - xfer->isoc_complete_time = (xfer->pipe->isoc_next + xfer->nframes) % USBD_ISOC_TIME_MAX; + /* compute how many milliseconds the + * insertion is ahead of the current + * frame position: + */ + buf_offset = (xfer->pipe->isoc_next - nframes) & + (EHCI_VIRTUAL_FRAMELIST_COUNT-1); + + /* pre-compute when the isochronous transfer + * will be finished: + */ + xfer->isoc_time_complete = + usbd_isoc_time_expand(&(sc->sc_bus), nframes) + buf_offset + + xfer->nframes; + + /* get the real number of frames */ nframes = xfer->nframes; @@ -2693,11 +2714,18 @@ DPRINTFN(5,("xfer=%p next=%d nframes=%d\n", xfer, xfer->pipe->isoc_next, xfer->nframes)); + /* get the current frame index */ + nframes = EOREAD4(sc, EHCI_FRINDEX) / 8; - if(((nframes - xfer->pipe->isoc_next) & - (EHCI_VIRTUAL_FRAMELIST_COUNT-1)) < xfer->nframes) - { + /* check if the frame index is within + * the window where the frames will be + * inserted + */ + buf_offset = (nframes - xfer->pipe->isoc_next) & + (EHCI_VIRTUAL_FRAMELIST_COUNT-1); + + if (buf_offset < xfer->nframes) { /* not in use yet, schedule it a few frames ahead */ /* data underflow */ xfer->pipe->isoc_next = (nframes + 3) & @@ -2705,7 +2733,21 @@ DPRINTFN(2,("start next=%d\n", xfer->pipe->isoc_next)); } - xfer->isoc_complete_time = (xfer->pipe->isoc_next + ((xfer->nframes+7)/8)) % USBD_ISOC_TIME_MAX; + /* compute how many milliseconds the + * insertion is ahead of the current + * frame position: + */ + buf_offset = (xfer->pipe->isoc_next - nframes) & + (EHCI_VIRTUAL_FRAMELIST_COUNT-1); + + /* pre-compute when the isochronous transfer + * will be finished: + */ + xfer->isoc_time_complete = + usbd_isoc_time_expand(&(sc->sc_bus), nframes) + buf_offset + + ((xfer->nframes+7)/8); + + /* get the real number of frames */ nframes = xfer->nframes; ==== //depot/projects/usb/src/sys/dev/usb/ohci.c#19 (text+ko) ==== @@ -1896,16 +1896,34 @@ nframes = le32toh(hw_ptr->hcca.hcca_frame_number); usbd_page_dma_enter(&(sc->sc_hw_page)); - if((((nframes - xfer->pipe->isoc_next) & ((1<<16)-1)) < xfer->nframes) || - (((xfer->pipe->isoc_next - nframes) & ((1<<16)-1)) >= 256)) + /* check if the frame index is within + * the window where the frames will be + * inserted and if the delay until start + * is too long + */ + if ((((nframes - xfer->pipe->isoc_next) & 0xFFFF) < xfer->nframes) || + (((xfer->pipe->isoc_next - nframes) & 0xFFFF) >= 128)) { /* not in use yet, schedule it a few frames ahead */ /* data underflow */ - xfer->pipe->isoc_next = (nframes + 5) & ((1<<16)-1); + xfer->pipe->isoc_next = (nframes + 3) & 0xFFFF; DPRINTFN(2,("start next=%d\n", xfer->pipe->isoc_next)); } - xfer->isoc_complete_time = (xfer->pipe->isoc_next + xfer->nframes) % USBD_ISOC_TIME_MAX; + /* compute how many milliseconds the + * insertion is ahead of the current + * frame position: + */ + buf_offset = ((xfer->pipe->isoc_next - nframes) & 0xFFFF); + + /* pre-compute when the isochronous transfer + * will be finished: + */ + xfer->isoc_time_complete = + (usbd_isoc_time_expand(&(sc->sc_bus), nframes) + buf_offset + + xfer->nframes); + + /* get the real number of frames */ nframes = xfer->nframes; ==== //depot/projects/usb/src/sys/dev/usb/uhci.c#21 (text+ko) ==== @@ -1998,16 +1998,31 @@ nframes = UREAD2(sc, UHCI_FRNUM); - if(((nframes - xfer->pipe->isoc_next) & - (UHCI_VFRAMELIST_COUNT-1)) < xfer->nframes) - { + buf_offset = (nframes - xfer->pipe->isoc_next) & + (UHCI_VFRAMELIST_COUNT-1); + + if (buf_offset < xfer->nframes) { /* not in use yet, schedule it a few frames ahead */ /* data underflow */ xfer->pipe->isoc_next = (nframes + 3) & (UHCI_VFRAMELIST_COUNT-1); DPRINTFN(2,("start next=%d\n", xfer->pipe->isoc_next)); } - xfer->isoc_complete_time = (xfer->pipe->isoc_next + xfer->nframes) % USBD_ISOC_TIME_MAX; + /* compute how many milliseconds the + * insertion is ahead of the current + * frame position: + */ + buf_offset = (xfer->pipe->isoc_next - nframes) & + (UHCI_VFRAMELIST_COUNT-1); + + /* pre-compute when the isochronous transfer + * will be finished: + */ + xfer->isoc_time_complete = + usbd_isoc_time_expand(&(sc->sc_bus), nframes) + buf_offset + + xfer->nframes; + + /* get the real number of frames */ nframes = xfer->nframes; ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#27 (text+ko) ==== @@ -2774,3 +2774,30 @@ USETW(edesc->wMaxPacketSize, n); return; } + +/*---------------------------------------------------------------------------* + * usbd_isoc_time_expand - expand time counter from 7-bit to 16-bit + *---------------------------------------------------------------------------*/ +uint16_t +usbd_isoc_time_expand(struct usbd_bus *bus, uint16_t isoc_time_curr) +{ + uint16_t rem; + + mtx_assert(&(bus->mtx), MA_OWNED); + + rem = bus->isoc_time_last & (USBD_ISOC_TIME_MAX-1); + + isoc_time_curr &= (USBD_ISOC_TIME_MAX-1); + + if (isoc_time_curr < rem) { + /* the time counter wrapped around */ + bus->isoc_time_last += USBD_ISOC_TIME_MAX; + } + + /* update the remainder */ + + bus->isoc_time_last &= ~(USBD_ISOC_TIME_MAX-1); + bus->isoc_time_last |= isoc_time_curr; + + return bus->isoc_time_last; +} ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#32 (text+ko) ==== @@ -178,6 +178,9 @@ uint32_t no_intrs; + uint16_t isoc_time_last; /* ms */ +#define USBD_ISOC_TIME_MAX 128 /* ms */ + uint8_t is_exploring; uint8_t wait_explore; uint8_t needs_explore;/* Set if a hub signalled a change. @@ -361,10 +364,8 @@ uint16_t max_packet_size; uint16_t max_frame_size; uint16_t qh_pos; + uint16_t isoc_time_complete; /* in ms */ -#define USBD_ISOC_TIME_MAX 128 /* ms */ - - uint8_t isoc_complete_time; /* in ms */ uint8_t address; uint8_t endpoint; uint8_t interval; /* milliseconds */ @@ -602,6 +603,7 @@ uint16_t usbd_get_max_packet_count(usb_endpoint_descriptor_t *edesc); uint16_t usbd_get_max_frame_size(usb_endpoint_descriptor_t *edesc); void usbd_set_max_packet_size_count(usb_endpoint_descriptor_t *edesc, uint16_t size, uint16_t count); +uint16_t usbd_isoc_time_expand(struct usbd_bus *bus, uint16_t isoc_time_curr); /* prototypes from usb.c */