From owner-p4-projects@FreeBSD.ORG Sun Dec 14 17:41:05 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2957B16A4D0; Sun, 14 Dec 2003 17:41:05 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 03F9C16A4CE for ; Sun, 14 Dec 2003 17:41:05 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C422843D2D for ; Sun, 14 Dec 2003 17:41:02 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBF1f2XJ001736 for ; Sun, 14 Dec 2003 17:41:02 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBF1f2mu001733 for perforce@freebsd.org; Sun, 14 Dec 2003 17:41:02 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Sun, 14 Dec 2003 17:41:02 -0800 (PST) Message-Id: <200312150141.hBF1f2mu001733@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 43936 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2003 01:41:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=43936 Change 43936 by cvance@cvance_release on 2003/12/14 17:40:25 Add file ioctl entry point and SEBSD implementation... Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/sys_generic.c#8 edit .. //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_file.c#4 edit .. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#29 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/sys_generic.c#8 (text+ko) ==== @@ -584,6 +584,14 @@ mtx_unlock(&Giant); return (EBADF); } +#ifdef MAC + error = mac_check_file_ioctl(td->td_ucred, fp, uap->com); + if (error) { + fdrop(fp, td); + mtx_unlock(&Giant); + return (error); + } +#endif fdp = td->td_proc->p_fd; switch (com = uap->com) { case FIONCLEX: ==== //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_file.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/sebsd.c#29 (text+ko) ==== @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -511,7 +512,6 @@ static void sebsd_create_cred(struct ucred *cred_parent, struct ucred *cred_child) { - int rc; struct task_security_struct *parent, *task; parent = SLOT(cred_parent->cr_label); @@ -1971,6 +1971,27 @@ FD__CREATE, NULL)); } +static int +sebsd_check_file_ioctl(struct ucred *cred, struct file *fp, + struct label *fplabel, u_long com) +{ + struct task_security_struct *tsec; + struct file_security_struct *fsec; + int error; + + tsec = SLOT(cred->cr_label); + fsec = SLOT(fplabel); + + error = avc_has_perm_audit(tsec->sid, fsec->sid, SECCLASS_FD, + FD__USE, NULL); + if (error) + return (error); + if (fp->f_type != DTYPE_VNODE) + return (0); + + return (vnode_has_perm(cred, fp->f_vnode, FILE__IOCTL, NULL)); +} + /* * Simplify all other fd permissions to just "use" for now. The ones we * implement in SEBSD roughly correlate to the SELinux FD__USE permissions, @@ -2442,10 +2463,11 @@ .mpo_check_cap = sebsd_check_cap, .mpo_check_cred_relabel = sebsd_check_cred_relabel, .mpo_check_file_create = sebsd_check_file_create, + .mpo_check_file_ioctl = sebsd_check_file_ioctl, + /* .mpo_check_file_dup .mpo_check_file_inherit - .mpo_check_file_ioctl .mpo_check_file_receive */ .mpo_check_file_get_flags = sebsd_check_file_get_flags, From owner-p4-projects@FreeBSD.ORG Mon Dec 15 11:15:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 608D616A4D0; Mon, 15 Dec 2003 11:15:02 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2196016A4CE for ; Mon, 15 Dec 2003 11:15:02 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C92D543D35 for ; Mon, 15 Dec 2003 11:15:00 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBFJF00B019176 for ; Mon, 15 Dec 2003 11:15:00 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBFJF0ob019163 for perforce@freebsd.org; Mon, 15 Dec 2003 11:15:00 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 15 Dec 2003 11:15:00 -0800 (PST) Message-Id: <200312151915.hBFJF0ob019163@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 Subject: PERFORCE change 43949 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2003 19:15:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=43949 Change 43949 by sam@sam_ebb on 2003/12/15 11:14:56 add protocol definitions for: o WPA o QOS o Atheros OUI o misc stuff useful for inclusion in tcpdump et. al. Affected files ... .. //depot/projects/netperf/sys/net80211/ieee80211.h#5 edit Differences ... ==== //depot/projects/netperf/sys/net80211/ieee80211.h#5 (text+ko) ==== @@ -118,6 +118,7 @@ #define IEEE80211_FC0_SUBTYPE_CFACK 0x50 #define IEEE80211_FC0_SUBTYPE_CFPOLL 0x60 #define IEEE80211_FC0_SUBTYPE_CF_ACK_CF_ACK 0x70 +#define IEEE80211_FC0_SUBTYPE_QOS 0x80 #define IEEE80211_FC1_DIR_MASK 0x03 #define IEEE80211_FC1_DIR_NODS 0x00 /* STA->STA */ @@ -139,6 +140,12 @@ #define IEEE80211_NWID_LEN 32 +#define IEEE80211_QOS_TXOP 0x00ff +/* bit 8 is reserved */ +#define IEEE80211_QOS_ACKPOLICY 0x0600 +#define IEEE80211_QOS_ESOP 0x0800 +#define IEEE80211_QOS_TID 0xf000 + /* * Control frames. */ @@ -217,7 +224,8 @@ #define IEEE80211_CAPINFO_CHNL_AGILITY 0x0080 /* bits 8-9 are reserved */ #define IEEE80211_CAPINFO_SHORT_SLOTTIME 0x0400 -/* bits 11-12 are reserved */ +#define IEEE80211_CAPINFO_RSN 0x0800 +/* bit 12 is reserved */ #define IEEE80211_CAPINFO_DSSSOFDM 0x2000 /* bits 14-15 are reserved */ @@ -260,6 +268,25 @@ struct erp { u_int8_t flags; } erp; + struct country { + u_int8_t cc[3]; /* ISO CC+(I)ndoor/(O)utdoor */ + struct { + u_int8_t schan; /* starting channel */ + u_int8_t nchan; /* number channels */ + u_int8_t maxtxpwr; + } band[4]; /* up to 4 sub bands */ + } country; + struct ath { + u_int8_t flags; + } ath; + struct rsn { + u_int16_t version; /* spec revision */ + u_int32_t mcipher[1]; /* multicast/group key cipher */ + u_int16_t uciphercnt; /* # pairwise key ciphers */ + u_int32_t uciphers[8]; /* ciphers */ + u_int16_t authselcnt; /* authentication selector cnt*/ + u_int32_t authsels[8]; /* selectors */ + } rsn __attribute__((__packed__)); }; enum { @@ -272,8 +299,12 @@ IEEE80211_ELEMID_IBSSPARMS = 6, IEEE80211_ELEMID_COUNTRY = 7, IEEE80211_ELEMID_CHALLENGE = 16, + /* 17-31 reserved for challenge text extension */ IEEE80211_ELEMID_ERP = 42, IEEE80211_ELEMID_XRATES = 50, + IEEE80211_ELEMID_TPC = 150, + IEEE80211_ELEMID_CCKM = 156, + IEEE80211_ELEMID_VENDOR = 221, /* vendor private */ }; #define IEEE80211_CHALLENGE_LEN 128 @@ -284,7 +315,31 @@ /* EPR information element flags */ #define IEEE80211_ERP_NON_ERP_PRESENT 0x01 #define IEEE80211_ERP_USE_PROTECTION 0x02 -#define IEEE80211_ERP_BARKER_MODE 0x04 +#define IEEE80211_ERP_LONG_PREAMBLE 0x04 + +/* Atheros private advanced capabilities info */ +#define ATHEROS_CAP_TURBO_PRIME 0x01 +#define ATHEROS_CAP_COMPRESSION 0x02 +#define ATHEROS_CAP_FAST_FRAME 0x04 +/* bits 3-6 reserved */ +#define ATHEROS_CAP_BOOST 0x80 + +#define ATH_OUI 0x7f0300 /* Atheros OUI */ +#define ATH_OUI_TYPE_CAP 0x01 +#define ATH_OUI_VER_CAP 0x01 + +#define WPA_OUI 0xf25000 +#define WPA_OUI_TYPE 0x01 + +#define WPA_OUI_CSE_NULL ((0x00<<24)|WPA_OUI) +#define WPA_OUI_CSE_WEP40 ((0x01<<24)|WPA_OUI) +#define WPA_OUI_CSE_TKIP ((0x02<<24)|WPA_OUI) +#define WPA_OUI_CSE_AES_CCMP ((0x04<<24)|WPA_OUI) +#define WPA_OUI_CSE_WEP104 ((0x05<<24)|WPA_OUI) + +#define WPA_OUI_ASE_NONE ((0x00<<24)|WPA_OUI) +#define WPA_OUI_ASE_8021X_UNSPEC ((0x01<<24)|WPA_OUI) +#define WPA_OUI_ASE_8021X_PSK ((0x02<<24)|WPA_OUI) /* * AUTH management packets @@ -308,6 +363,7 @@ #define IEEE80211_AUTH_ALG_OPEN 0x0000 #define IEEE80211_AUTH_ALG_SHARED 0x0001 +#define IEEE80211_AUTH_ALG_LEAP 0x0080 enum { IEEE80211_AUTH_OPEN_REQUEST = 1, @@ -338,6 +394,11 @@ IEEE80211_REASON_ASSOC_LEAVE = 8, IEEE80211_REASON_ASSOC_NOT_AUTHED = 9, + IEEE80211_REASON_RSN_REQUIRED = 11, + IEEE80211_REASON_RSN_INCONSISTENT = 12, + IEEE80211_REASON_IE_INVALID = 13, + IEEE80211_REASON_MIC_FAILURE = 14, + IEEE80211_STATUS_SUCCESS = 0, IEEE80211_STATUS_UNSPECIFIED = 1, IEEE80211_STATUS_CAPINFO = 10, From owner-p4-projects@FreeBSD.ORG Mon Dec 15 11:44:39 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEA6F16A4D0; Mon, 15 Dec 2003 11:44:38 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B2CB416A4CE for ; Mon, 15 Dec 2003 11:44:38 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 77FAC43D32 for ; Mon, 15 Dec 2003 11:44:37 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBFJib0B020385 for ; Mon, 15 Dec 2003 11:44:37 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBFJibV0020382 for perforce@freebsd.org; Mon, 15 Dec 2003 11:44:37 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 15 Dec 2003 11:44:37 -0800 (PST) Message-Id: <200312151944.hBFJibV0020382@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 Subject: PERFORCE change 43951 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2003 19:44:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=43951 Change 43951 by sam@sam_ebb on 2003/12/15 11:43:52 o fix station-side shared key authentication: add missing auth challenge frame send o fixup some debug msgs related to shared key authentication Affected files ... .. //depot/projects/netperf/sys/net80211/ieee80211_input.c#18 edit Differences ... ==== //depot/projects/netperf/sys/net80211/ieee80211_input.c#18 (text+ko) ==== @@ -784,7 +784,7 @@ IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_AUTH, seq + 1); if (ifp->if_flags & IFF_DEBUG) - if_printf(ifp, "station %s %s authenticated\n", + if_printf(ifp, "station %s %s authenticated (open)\n", ether_sprintf(ni->ni_macaddr), (allocbs ? "newly" : "already")); break; @@ -797,7 +797,7 @@ } if (status != 0) { if_printf(&ic->ic_if, - "authentication failed (reason %d) for %s\n", + "open authentication failed (reason %d) for %s\n", status, ether_sprintf(wh->i_addr3)); if (ni != ic->ic_bss) @@ -829,7 +829,7 @@ } if (frm + 1 < efrm) { - if ((frm[1] + 2) > (efrm - frm)) { + if (frm[1] + 2 > efrm - frm) { IEEE80211_DPRINTF(("elt %d %d bytes too long\n", frm[0], (frm[1] + 2) - (efrm - frm))); return; @@ -893,6 +893,11 @@ for (i = IEEE80211_CHALLENGE_LEN / sizeof(u_int32_t); --i >= 0; ) ni->ni_challenge[i] = arc4random(); + if (ifp->if_flags & IFF_DEBUG) + if_printf(ifp, "station %s shared key " + "%sauthentication\n", + ether_sprintf(ni->ni_macaddr), + allocbs ? "" : "re"); break; case IEEE80211_AUTH_SHARED_RESPONSE: if (ni == ic->ic_bss) { @@ -900,7 +905,6 @@ __func__)); return; } - allocbs = 1; if (ni->ni_challenge == NULL) { IEEE80211_DPRINTF(( "%s: no challenge recorded\n", __func__)); @@ -912,6 +916,10 @@ __func__)); return; } + if (ifp->if_flags & IFF_DEBUG) + if_printf(ifp, "station %s authenticated " + "(shared key)\n", + ether_sprintf(ni->ni_macaddr)); break; default: IEEE80211_DPRINTF(("%s: bad seq %d from %s\n", @@ -920,10 +928,6 @@ } IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_AUTH, seq + 1); - if (ifp->if_flags & IFF_DEBUG) - if_printf(ifp, "station %s %s authenticated\n", - ether_sprintf(ni->ni_macaddr), - (allocbs ? "newly" : "already")); break; case IEEE80211_M_STA: @@ -937,7 +941,8 @@ } if (status != 0) { if_printf(&ic->ic_if, - "%s: auth failed (reason %d) for %s\n", + "%s: shared authentication failed " + "(reason %d) for %s\n", __func__, status, ether_sprintf(wh->i_addr3)); if (ni != ic->ic_bss) @@ -958,6 +963,8 @@ return; } memcpy(ni->ni_challenge, &challenge[2], challenge[1]); + IEEE80211_SEND_MGMT(ic, ni, + IEEE80211_FC0_SUBTYPE_AUTH, seq + 1); break; default: IEEE80211_DPRINTF(("%s: bad seq %d from %s\n", @@ -1260,7 +1267,8 @@ ieee80211_auth_open(ic, wh, ni, rssi, rstamp, seq, status); else { - IEEE80211_DPRINTF(("%s: unsupported auth %d from %s\n", + IEEE80211_DPRINTF(("%s: unsupported authentication " + "algorithm %d from %s\n", __func__, algo, ether_sprintf(wh->i_addr2))); ic->ic_stats.is_rx_auth_unsupported++; return; From owner-p4-projects@FreeBSD.ORG Mon Dec 15 11:45:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1177E16A4D0; Mon, 15 Dec 2003 11:45:41 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CB0DA16A4CE for ; Mon, 15 Dec 2003 11:45:40 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6ABFA43D35 for ; Mon, 15 Dec 2003 11:45:39 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBFJjd0B020478 for ; Mon, 15 Dec 2003 11:45:39 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBFJjci2020475 for perforce@freebsd.org; Mon, 15 Dec 2003 11:45:38 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 15 Dec 2003 11:45:38 -0800 (PST) Message-Id: <200312151945.hBFJjci2020475@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 Subject: PERFORCE change 43952 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Dec 2003 19:45:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=43952 Change 43952 by sam@sam_ebb on 2003/12/15 11:44:45 hookup shared key authentication support to the ioctl infrastructure Affected files ... .. //depot/projects/netperf/sys/net80211/ieee80211_ioctl.c#11 edit .. //depot/projects/netperf/sys/net80211/ieee80211_output.c#13 edit .. //depot/projects/netperf/sys/net80211/ieee80211_proto.c#11 edit .. //depot/projects/netperf/sys/net80211/ieee80211_var.h#12 edit Differences ... ==== //depot/projects/netperf/sys/net80211/ieee80211_ioctl.c#11 (text+ko) ==== @@ -213,7 +213,7 @@ wreq.wi_len = 1; break; case WI_RID_CNFAUTHMODE: - wreq.wi_val[0] = htole16(1); /* TODO: open system only */ + wreq.wi_val[0] = htole16(ic->ic_authmode); wreq.wi_len = 1; break; case WI_RID_ENCRYPTION: @@ -632,8 +632,14 @@ case WI_RID_CNFAUTHMODE: if (len != 2) return EINVAL; - if (le16toh(wreq.wi_val[0]) != 1) - return EINVAL; /* TODO: shared key auth */ + if (le16toh(wreq.wi_val[0]) > IEEE80211_AUTH_SHARED) + return EINVAL; + /* shared key authentication requires WEP */ + if (le16toh(wreq.wi_val[0]) == IEEE80211_AUTH_SHARED && + (ic->ic_flags & IEEE80211_F_WEPON) == 0) + return EINVAL; + ic->ic_authmode = le16toh(wreq.wi_val[0]); + error = ENETRESET; break; case WI_RID_ENCRYPTION: if (len != 2) @@ -830,7 +836,7 @@ ireq->i_val = ic->ic_wep_txkey; break; case IEEE80211_IOC_AUTHMODE: - ireq->i_val = IEEE80211_AUTH_OPEN; + ireq->i_val = ic->ic_authmode; break; case IEEE80211_IOC_CHANNEL: switch (ic->ic_state) { @@ -928,11 +934,23 @@ ic->ic_wep_txkey = kid; error = ENETRESET; break; -#if 0 case IEEE80211_IOC_AUTHMODE: - sc->wi_authmode = ireq->i_val; + if (!(IEEE80211_AUTH_NONE <= ireq->i_val && + ireq->i_val <= IEEE80211_AUTH_SHARED)) { + error = EINVAL; + break; + } + if (ireq->i_val == IEEE80211_AUTH_SHARED && + (ic->ic_flags & IEEE80211_F_WEPON) == 0) { + /* shared key authentication requires WEP */ + error = EINVAL; + break; + } + if (ic->ic_authmode != ireq->i_val) { + ic->ic_authmode = ireq->i_val; + error = ENETRESET; + } break; -#endif case IEEE80211_IOC_CHANNEL: /* XXX 0xffff overflows 16-bit signed */ if (ireq->i_val == 0 || ==== //depot/projects/netperf/sys/net80211/ieee80211_output.c#13 (text+ko) ==== @@ -451,8 +451,17 @@ arg == IEEE80211_AUTH_SHARED_RESPONSE) && ni->ni_challenge != NULL); - is_shared_key = has_challenge || (ni->ni_challenge != NULL && - arg == IEEE80211_AUTH_SHARED_PASS); + /* + * Deduce whether we're doing open authentication or + * shared key authentication. We do the latter if + * we're in the middle of a shared key authentication + * handshake or if we're initiating an authentication + * request and configured to use shared key. + */ + is_shared_key = has_challenge || + arg >= IEEE80211_AUTH_SHARED_RESPONSE || + (arg == IEEE80211_AUTH_SHARED_REQUEST && + ic->ic_authmode == IEEE80211_AUTH_SHARED); if (has_challenge) { MH_ALIGN(m, 2 * 3 + 2 + IEEE80211_CHALLENGE_LEN); ==== //depot/projects/netperf/sys/net80211/ieee80211_proto.c#11 (text+ko) ==== @@ -103,6 +103,7 @@ #endif ic->ic_fragthreshold = 2346; /* XXX not used yet */ ic->ic_fixed_rate = -1; /* no fixed rate */ + ic->ic_authmode = IEEE80211_AUTH_OPEN; mtx_init(&ic->ic_mgtq.ifq_mtx, ifp->if_xname, "mgmt send q", MTX_DEF); mtx_init(&ic->ic_pwrsaveq.ifq_mtx, ifp->if_xname, "power save q", MTX_DEF); ==== //depot/projects/netperf/sys/net80211/ieee80211_var.h#12 (text+ko) ==== @@ -203,6 +203,7 @@ u_int16_t ic_txlifetime; /* tx lifetime */ u_int16_t ic_txpower; /* tx power setting (dbM) */ u_int16_t ic_bmisstimeout;/* beacon miss threshold (ms) */ + u_int16_t ic_authmode; /* authentication mode */ int ic_mgt_timer; /* mgmt timeout */ int ic_inact_timer; /* inactivity timer wait */ int ic_des_esslen; From owner-p4-projects@FreeBSD.ORG Mon Dec 15 21:29:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E95116A4D1; Mon, 15 Dec 2003 21:29:28 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 557EF16A4CE for ; Mon, 15 Dec 2003 21:29:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BD01643D33 for ; Mon, 15 Dec 2003 21:29:26 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBG5TQ0B066216 for ; Mon, 15 Dec 2003 21:29:26 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBG5TQiL066213 for perforce@freebsd.org; Mon, 15 Dec 2003 21:29:26 -0800 (PST) (envelope-from sam@freebsd.org) Date: Mon, 15 Dec 2003 21:29:26 -0800 (PST) Message-Id: <200312160529.hBG5TQiL066213@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 Subject: PERFORCE change 43962 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Dec 2003 05:29:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=43962 Change 43962 by sam@sam_ebb on 2003/12/15 21:29:21 this should fix the sbflush panic Affected files ... .. //depot/projects/netperf+sockets/sys/netinet/tcp_usrreq.c#4 edit Differences ... ==== //depot/projects/netperf+sockets/sys/netinet/tcp_usrreq.c#4 (text+ko) ==== @@ -1190,7 +1190,9 @@ tp = tcp_drop(tp, 0); else { soisdisconnecting(so); + SOCKBUF_LOCK(&so->so_rcv); sbflush(&so->so_rcv); + SOCKBUF_UNLOCK(&so->so_rcv); tp = tcp_usrclosed(tp); if (tp) (void) tcp_output(tp); From owner-p4-projects@FreeBSD.ORG Tue Dec 16 07:38:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E5A916A4D0; Tue, 16 Dec 2003 07:38:57 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0BD8016A4CE for ; Tue, 16 Dec 2003 07:38:57 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9057A43D3F for ; Tue, 16 Dec 2003 07:38:54 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBGFcs0B009142 for ; Tue, 16 Dec 2003 07:38:54 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBGFcrjx009139 for perforce@freebsd.org; Tue, 16 Dec 2003 07:38:53 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Tue, 16 Dec 2003 07:38:53 -0800 (PST) Message-Id: <200312161538.hBGFcrjx009139@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 43969 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Dec 2003 15:38:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=43969 Change 43969 by cvance@cvance_korben on 2003/12/16 07:37:54 Update SEBSD policy for newer FreeBSD distribution (file locations, behavior, new MAC framework support, etc. Affected files ... .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/cleanvar.te#4 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/getty.te#4 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/initrc.te#3 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/login.te#3 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/mount.te#3 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/sendmail.te#2 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/ssh.te#7 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/syslogd.te#3 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/mount.fc#3 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/save-entropy.fc#3 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/ssh.fc#3 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/types.fc#5 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/su_macros.te#2 edit Differences ... ==== //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/cleanvar.te#4 (text+ko) ==== @@ -13,11 +13,15 @@ domain_auto_trans(initrc_t, cleanvar_exec_t, cleanvar_t) allow cleanvar_t self:fd *; +allow cleanvar_t init_t:fd use; allow cleanvar_t { var_run_t var_spool_t }:dir { rw_dir_perms }; +allow cleanvar_t var_run_t:file create_file_perms; +allow cleanvar_t var_spool_t:file create_file_perms; # We really need /var/{run,spool}/*... allow cleanvar_t { pidfile var_spool_t }:file { getattr unlink }; -allow cleanvar_t { var_t etc_t bin_t sbin_t root_t } :dir r_dir_perms; +allow cleanvar_t { var_t etc_t bin_t sbin_t root_t device_t } :dir r_dir_perms; +allow cleanvar_t null_device_t:chr_file r_file_perms; allow cleanvar_t self:capability dac_override; allow cleanvar_t fs_t:filesystem { getattr }; can_exec(cleanvar_t, bin_t) ==== //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/getty.te#4 (text+ko) ==== @@ -59,4 +59,4 @@ rw_dir_create_file(getty_t, var_lock_t) -dontaudit getty_t sysadm_home_t:dir search; +dontaudit getty_t staff_home_dir_t:dir search; ==== //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/initrc.te#3 (text+ko) ==== @@ -25,6 +25,7 @@ # read files in /etc/init.d allow initrc_t etc_t:lnk_file r_file_perms; +allow initrc_t resolv_conf_t:{ file lnk_file } r_file_perms; read_locale(initrc_t) @@ -122,6 +123,7 @@ ifdef(`sendmail.te', ` # Update /etc/mail. allow initrc_t etc_mail_t:file { setattr rw_file_perms }; +allow initrc_t sendmail_exec_t:lnk_file read; ') ifdef(`xfs.te', @@ -186,8 +188,8 @@ allow initrc_t tty_device_t:chr_file relabelto; # Use lock files in /var/spool/lock. -allow initrc_t var_spool_t:dir create_file_perms; -allow initrc_t var_spool_t:file { rw_file_perms unlink }; +allow initrc_t var_spool_t:dir create_dir_perms; +allow initrc_t var_spool_t:file { create_file_perms unlink }; ifdef(`rpm.te', ` # Create and read /boot/kernel.h. @@ -209,6 +211,7 @@ ifdef(`gpm.te', `allow initrc_t gpmctl_t:sock_file setattr;') allow initrc_t var_spool_t:file rw_file_perms; +allow initrc_t mqueue_spool_t:dir r_dir_perms; # # quota control ==== //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/login.te#3 (text+ko) ==== @@ -154,6 +154,9 @@ allow local_login_t sysadm_home_t:dir search; +type opiekey_t, file_type, sysadmfile; +allow local_login_t opiekey_t:file rw_file_perms; + ################################# # # Rules for the remote_login_t domain. ==== //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/mount.te#3 (text+ko) ==== @@ -15,10 +15,20 @@ role sysadm_r types mount_t; role system_r types mount_t; +domain_auto_trans(init_t, mount_exec_t, mount_t) domain_auto_trans(initrc_t, mount_exec_t, mount_t) allow mount_t init_t:fd use; allow mount_t privfd:fd use; +# XXX/TBD +# When you label a filesystem, the directories _under_ the mount points +# aren't typically available, and remain unlabeled. Not sure what the +# best fix is for this. In the meantime, allow the system to boot: +allow init_t unlabeled_t:dir mounton; +allow init_t device_t:filesystem mount; +allow mount_t unlabeled_t:dir { mounton getattr }; +allow mount_t file_t:dir getattr; + allow mount_t self:capability { mknod ipc_lock dac_override }; allow mount_t self:process { fork signal_perms }; allow mount_t self:fd { create use }; ==== //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/sendmail.te#2 (symlink) ==== ==== //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/ssh.te#7 (text+ko) ==== @@ -136,7 +136,7 @@ can_exec(sshd_t, sshd_exec_t); # Use capabilities. -allow sshd_t self:capability { sys_chroot sys_resource }; +allow sshd_t self:capability { net_admin sys_chroot sys_resource }; # Create /var/run/sshd.pid var_run_domain(sshd) ==== //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/syslogd.te#3 (text+ko) ==== @@ -31,7 +31,7 @@ allow syslogd_t resolv_conf_t:{ file lnk_file } r_file_perms; # Use capabilities. -allow syslogd_t syslogd_t:capability { kill net_bind_service dac_override }; +allow syslogd_t syslogd_t:capability { kill net_admin net_bind_service dac_override }; # Inherit and use descriptors from init. allow syslogd_t init_t:fd use; ==== //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/mount.fc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # mount -/bin/mount system_u:object_r:mount_exec_t +/sbin/mount system_u:object_r:mount_exec_t /sbin/mdmfs system_u:object_r:mount_exec_t /sbin/mount_.* system_u:object_r:mount_exec_t /sbin/umount system_u:object_r:mount_exec_t ==== //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/save-entropy.fc#3 (text+ko) ==== @@ -1,2 +1,3 @@ /usr/libexec/save-entropy system_u:object_r:save_entropy_exec_t /var/db/entropy(/.*)? system_u:object_r:var_db_entropy_t +/entropy system_u:object_r:var_db_entropy_t ==== //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/ssh.fc#3 (text+ko) ==== @@ -11,4 +11,5 @@ /root/\.ssh(/.*)? system_u:object_r:staff_home_ssh_t /home/[^/]+/\.ssh(/.*)? system_u:object_r:user_home_ssh_t -/home/jadmin/\.ssh(/.*)? system_u:object_r:staff_home_ssh_t +/usr/home/[^/]+/\.ssh(/.*)? system_u:object_r:user_home_ssh_t +/home/jadmin/\.ssh(/.*)? system_u:object_r:staff_home_ssh_t ==== //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/types.fc#5 (text+ko) ==== @@ -168,7 +168,7 @@ /etc/rc.d/sshd system_u:object_r:initrc_exec_t /etc/rc.shutdown system_u:object_r:initrc_exec_t /etc/rc system_u:object_r:initrc_exec_t - +/etc/opiekeys system_u:object_r:opiekey_t # # /lib # @@ -198,6 +198,7 @@ /usr(/.*)? system_u:object_r:usr_t /usr/etc(/.*)? system_u:object_r:etc_t /usr/libexec(/.*)? system_u:object_r:lib_t +/libexec(/.*)? system_u:object_r:lib_t /usr/src(/.*)? system_u:object_r:src_t /usr/tmp(/.*)? system_u:object_r:tmp_t /usr/man(/.*)? system_u:object_r:man_t @@ -231,6 +232,7 @@ /usr/share/selinux(/.*)? system_u:object_r:policy_src_t /usr/games(/.*)? system_u:object_r:bin_t /usr/libexec/ld.*\.so.* system_u:object_r:ld_so_t +/libexec/ld.*\.so.* system_u:object_r:ld_so_t /usr/lib/pam_.* system_u:object_r:shlib_t # ==== //depot/projects/trustedbsd/sebsd_policy/policy/macros/program/su_macros.te#2 (text+ko) ==== @@ -46,6 +46,7 @@ allow $1_su_t bin_t:lnk_file read; allow $1_su_t privfd:fd use; +allow $1_su_t self:fd { create use }; # Write to utmp. allow $1_su_t { var_t var_run_t }:dir search; From owner-p4-projects@FreeBSD.ORG Tue Dec 16 11:12:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE07316A4D0; Tue, 16 Dec 2003 11:12:18 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A954A16A4CE for ; Tue, 16 Dec 2003 11:12:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C63043D35 for ; Tue, 16 Dec 2003 11:12:17 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBGJCH0B025909 for ; Tue, 16 Dec 2003 11:12:17 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBGJCGYv025906 for perforce@freebsd.org; Tue, 16 Dec 2003 11:12:16 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 16 Dec 2003 11:12:16 -0800 (PST) Message-Id: <200312161912.hBGJCGYv025906@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 Subject: PERFORCE change 43979 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Dec 2003 19:12:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=43979 Change 43979 by sam@sam_ebb on 2003/12/16 11:11:23 add some locking missed in my first pass merging from bsd/os Affected files ... .. //depot/projects/netperf+sockets/sys/netinet/tcp_input.c#3 edit .. //depot/projects/netperf+sockets/sys/nfsclient/nfs_socket.c#4 edit Differences ... ==== //depot/projects/netperf+sockets/sys/netinet/tcp_input.c#3 (text+ko) ==== @@ -1039,6 +1039,7 @@ acked = th->th_ack - tp->snd_una; tcpstat.tcps_rcvackpack++; tcpstat.tcps_rcvackbyte += acked; + SOCKBUF_LOCK(&so->so_snd); sbdrop(&so->so_snd, acked); if (SEQ_GT(tp->snd_una, tp->snd_recover) && SEQ_LEQ(th->th_ack, tp->snd_recover)) @@ -1076,7 +1077,8 @@ tp->t_rxtcur, tcp_timer_rexmt, tp); - sowwakeup(so); + sowwakeup_locked(so); + SOCKBUF_UNLOCK(&so->so_snd); if (so->so_snd.sb_cc) (void) tcp_output(tp); goto check_delack; @@ -1964,6 +1966,7 @@ incr = incr * incr / cw; tp->snd_cwnd = min(cw+incr, TCP_MAXWIN<snd_scale); } + SOCKBUF_LOCK(&so->so_snd); if (acked > so->so_snd.sb_cc) { tp->snd_wnd -= so->so_snd.sb_cc; sbdrop(&so->so_snd, (int)so->so_snd.sb_cc); @@ -1973,7 +1976,8 @@ tp->snd_wnd -= acked; ourfinisacked = 0; } - sowwakeup(so); + sowwakeup_locked(so); + SOCKBUF_UNLOCK(&so->so_snd); /* detect una wraparound */ if (tcp_do_newreno && !IN_FASTRECOVERY(tp) && SEQ_GT(tp->snd_una, tp->snd_recover) && ==== //depot/projects/netperf+sockets/sys/nfsclient/nfs_socket.c#4 (text+ko) ==== @@ -160,7 +160,7 @@ nfs_connect(struct nfsmount *nmp, struct nfsreq *rep) { struct socket *so; - int s, error, rcvreserve, sndreserve; + int error, rcvreserve, sndreserve; int pktscale; struct sockaddr *saddr; struct thread *td = &thread0; /* only used for socreate and sobind */ @@ -243,25 +243,25 @@ * connect system call but with the wait timing out so * that interruptible mounts don't hang here for a long time. */ - s = splnet(); + SOCK_LOCK(so); while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) { - (void) tsleep(&so->so_timeo, + (void) msleep(&so->so_timeo, SOCK_MTX(so), PSOCK, "nfscon", 2 * hz); if ((so->so_state & SS_ISCONNECTING) && so->so_error == 0 && rep && (error = nfs_sigintr(nmp, rep, rep->r_td)) != 0) { so->so_state &= ~SS_ISCONNECTING; - splx(s); + SOCK_UNLOCK(so); goto bad; } } if (so->so_error) { error = so->so_error; so->so_error = 0; - splx(s); + SOCK_UNLOCK(so); goto bad; } - splx(s); + SOCK_UNLOCK(so); } so->so_rcv.sb_timeo = 5 * hz; so->so_snd.sb_timeo = 5 * hz; From owner-p4-projects@FreeBSD.ORG Tue Dec 16 12:12:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62F0116A4D0; Tue, 16 Dec 2003 12:12:02 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 383DC16A4CE for ; Tue, 16 Dec 2003 12:12:02 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3CE0E43D3C for ; Tue, 16 Dec 2003 12:11:59 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBGKBx0B029286 for ; Tue, 16 Dec 2003 12:11:59 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBGKBwL7029283 for perforce@freebsd.org; Tue, 16 Dec 2003 12:11:58 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 16 Dec 2003 12:11:58 -0800 (PST) Message-Id: <200312162011.hBGKBwL7029283@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 Subject: PERFORCE change 43982 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Dec 2003 20:12:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=43982 Change 43982 by sam@sam_ebb on 2003/12/16 12:11:40 eliminate LOR between so_rcv and radix head by changing tcp_twrespond to not require a socket--it had been doing this to be able to create a MAC label from the socket but instead it can create it from the inpcb that is always available Affected files ... .. //depot/projects/netperf+sockets/sys/netinet/tcp_input.c#4 edit .. //depot/projects/netperf+sockets/sys/netinet/tcp_subr.c#4 edit .. //depot/projects/netperf+sockets/sys/netinet/tcp_var.h#3 edit Differences ... ==== //depot/projects/netperf+sockets/sys/netinet/tcp_input.c#4 (text+ko) ==== @@ -3044,7 +3044,7 @@ */ if (thflags != TH_ACK || tlen != 0 || th->th_seq != tw->rcv_nxt || th->th_ack != tw->snd_nxt) - tcp_twrespond(tw, NULL, m, TH_ACK); + tcp_twrespond(tw, TH_ACK); goto drop; reset: ==== //depot/projects/netperf+sockets/sys/netinet/tcp_subr.c#4 (text+ko) ==== @@ -1573,14 +1573,14 @@ } tcp_discardcb(tp); so = inp->inp_socket; - SOCK_LOCK(so); /* XXX LOR */ + SOCK_LOCK(so); so->so_pcb = NULL; tw->tw_cred = crhold(so->so_cred); tw->tw_so_options = so->so_options; + sotryfree(so); /* NB: drops lock */ + inp->inp_socket = NULL; if (acknow) - tcp_twrespond(tw, so, NULL, TH_ACK); - sotryfree(so); - inp->inp_socket = NULL; + tcp_twrespond(tw, TH_ACK); inp->inp_ppcb = (caddr_t)tw; inp->inp_vflag |= INP_TIMEWAIT; tcp_timer_2msl_reset(tw, tw_time); @@ -1644,8 +1644,7 @@ * construct a label for ay resulting packet. */ int -tcp_twrespond(struct tcptw *tw, struct socket *so, struct mbuf *msrc, - int flags) +tcp_twrespond(struct tcptw *tw, int flags) { struct inpcb *inp = tw->tw_inpcb; struct tcphdr *th; @@ -1659,8 +1658,7 @@ int isipv6 = inp->inp_inc.inc_isipv6; #endif - KASSERT(so != NULL || msrc != NULL, - ("tcp_twrespond: so and msrc NULL")); + INP_LOCK_ASSERT(inp); m = m_gethdr(M_DONTWAIT, MT_HEADER); if (m == NULL) @@ -1668,10 +1666,7 @@ m->m_data += max_linkhdr; #ifdef MAC - if (so != NULL) - mac_create_mbuf_from_socket(so, m); - else - mac_create_mbuf_netlayer(msrc, m); + mac_create_mbuf_from_inpcb(so, inp); #endif #ifdef INET6 ==== //depot/projects/netperf+sockets/sys/netinet/tcp_var.h#3 (text+ko) ==== @@ -509,7 +509,7 @@ tcp_quench(struct inpcb *, int); void tcp_respond(struct tcpcb *, void *, struct tcphdr *, struct mbuf *, tcp_seq, tcp_seq, int); -int tcp_twrespond(struct tcptw *, struct socket *, struct mbuf *, int); +int tcp_twrespond(struct tcptw *, int); void tcp_setpersist(struct tcpcb *); void tcp_slowtimo(void); struct tcptemp * From owner-p4-projects@FreeBSD.ORG Tue Dec 16 14:02:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47B5116A4D0; Tue, 16 Dec 2003 14:02:38 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 055B316A4CE for ; Tue, 16 Dec 2003 14:02:38 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1515143D3F for ; Tue, 16 Dec 2003 14:02:15 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBGM2E0B040756 for ; Tue, 16 Dec 2003 14:02:14 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBGM2EMM040753 for perforce@freebsd.org; Tue, 16 Dec 2003 14:02:14 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 16 Dec 2003 14:02:14 -0800 (PST) Message-Id: <200312162202.hBGM2EMM040753@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 43986 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Dec 2003 22:02:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=43986 Change 43986 by rwatson@rwatson_tislabs on 2003/12/16 14:01:57 Switch TCP over to using the inpcb label when responding in timed wait, rather than the socket label. This avoids reaching up to the socket layer during connection close, which requires locking changes. To do this, introduce MAC Framework entry point mac_create_mbuf_from_inpcb(), which is called from tcp_twrespond() instead of calling mac_create_mbuf_from_socket() or mac_create_mbuf_netlayer(). Introduce MAC Policy entry point mpo_create_mbuf_from_inpcb(), and implementations for various policies, which generally just copy label data from the inpcb to the mbuf. Assert the inpcb lock in the entry point since we require consistency for the inpcb label reference. Affected files ... .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#40 edit .. //depot/projects/trustedbsd/mac/sys/security/mac/mac_net.c#20 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#240 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#82 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#194 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_stub/mac_stub.c#18 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#128 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#258 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#207 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#40 (text+ko) ==== @@ -1662,10 +1662,7 @@ m->m_data += max_linkhdr; #ifdef MAC - if (so != NULL) - mac_create_mbuf_from_socket(so, m); - else - mac_create_mbuf_netlayer(msrc, m); + mac_create_mbuf_from_inpcb(inp, m); #endif #ifdef INET6 ==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_net.c#20 (text+ko) ==== @@ -589,6 +589,17 @@ } void +mac_create_mbuf_from_inpcb(struct inpcb *inp, struct mbuf *m) +{ + struct label *mlabel; + + INP_LOCK_ASSERT(inp); + mlabel = mbuf_to_label(m); + + MAC_PERFORM(create_mbuf_from_inpcb, inp, inp->inp_label, m, mlabel); +} + +void mac_create_mbuf_from_mbuf(struct mbuf *oldmbuf, struct mbuf *newmbuf) { struct label *oldmbuflabel, *newmbuflabel; ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#240 (text+ko) ==== @@ -1339,6 +1339,18 @@ } static void +mac_biba_create_mbuf_from_inpcb(struct inpcb *inp, struct label *inplabel, + struct mbuf *m, struct label *mlabel) +{ + struct mac_biba *source, *dest; + + source = SLOT(inplabel); + dest = SLOT(mlabel); + + mac_biba_copy_single(source, dest); +} + +static void mac_biba_create_mbuf_from_mbuf(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct mbuf *newmbuf, struct label *newmbuflabel) @@ -3219,6 +3231,7 @@ .mpo_create_ipc_sema = mac_biba_create_ipc_sema, .mpo_create_ipc_shm = mac_biba_create_ipc_shm, .mpo_create_ipq = mac_biba_create_ipq, + .mpo_create_mbuf_from_inpcb = mac_biba_create_mbuf_from_inpcb, .mpo_create_mbuf_from_mbuf = mac_biba_create_mbuf_from_mbuf, .mpo_create_mbuf_linklayer = mac_biba_create_mbuf_linklayer, .mpo_create_mbuf_from_bpfdesc = mac_biba_create_mbuf_from_bpfdesc, ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#82 (text+ko) ==== @@ -1423,6 +1423,18 @@ } static void +mac_lomac_create_mbuf_from_inpcb(struct inpcb *inp, struct label *inplabel, + struct mbuf *m, struct label *mlabel) +{ + struct mac_lomac *source, *dest; + + source = SLOT(inplabel); + dest = SLOT(mlabel); + + mac_lomac_copy_single(source, dest); +} + +static void mac_lomac_create_mbuf_from_mbuf(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct mbuf *newmbuf, struct label *newmbuflabel) @@ -3149,6 +3161,7 @@ .mpo_create_ipc_sema = mac_lomac_create_ipc_sema, .mpo_create_ipc_shm = mac_lomac_create_ipc_shm, .mpo_create_ipq = mac_lomac_create_ipq, + .mpo_create_mbuf_from_inpcb = mac_lomac_create_mbuf_from_inpcb, .mpo_create_mbuf_from_mbuf = mac_lomac_create_mbuf_from_mbuf, .mpo_create_mbuf_linklayer = mac_lomac_create_mbuf_linklayer, .mpo_create_mbuf_from_bpfdesc = mac_lomac_create_mbuf_from_bpfdesc, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#194 (text+ko) ==== @@ -1278,6 +1278,18 @@ } static void +mac_mls_create_mbuf_from_inpcb(struct inpcb *inp, struct label *inplabel, + struct mbuf *m, struct label *mlabel) +{ + struct mac_mls *source, *dest; + + source = SLOT(inplabel); + dest = SLOT(mlabel); + + mac_mls_copy_single(source, dest); +} + +static void mac_mls_create_mbuf_from_mbuf(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct mbuf *newmbuf, struct label *newmbuflabel) @@ -2996,6 +3008,7 @@ .mpo_create_ipc_msgqueue = mac_mls_create_ipc_msgqueue, .mpo_create_ipc_sema = mac_mls_create_ipc_sema, .mpo_create_ipc_shm = mac_mls_create_ipc_shm, + .mpo_create_mbuf_from_inpcb = mac_mls_create_mbuf_from_inpcb, .mpo_create_mbuf_from_mbuf = mac_mls_create_mbuf_from_mbuf, .mpo_create_mbuf_linklayer = mac_mls_create_mbuf_linklayer, .mpo_create_mbuf_from_bpfdesc = mac_mls_create_mbuf_from_bpfdesc, ==== //depot/projects/trustedbsd/mac/sys/security/mac_stub/mac_stub.c#18 (text+ko) ==== @@ -394,6 +394,13 @@ } static void +stub_create_mbuf_from_inpcb(struct inpcb *inp, struct label *inplabel, + struct mbuf *m, struct label *mlabel) +{ + +} + +static void stub_create_mbuf_from_mbuf(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct mbuf *newmbuf, struct label *newmbuflabel) @@ -1368,6 +1375,7 @@ .mpo_create_datagram_from_ipq = stub_create_datagram_from_ipq, .mpo_create_fragment = stub_create_fragment, .mpo_create_ipq = stub_create_ipq, + .mpo_create_mbuf_from_inpcb = stub_create_mbuf_from_inpcb, .mpo_create_mbuf_from_mbuf = stub_create_mbuf_from_mbuf, .mpo_create_mbuf_linklayer = stub_create_mbuf_linklayer, .mpo_create_mbuf_from_bpfdesc = stub_create_mbuf_from_bpfdesc, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#128 (text+ko) ==== @@ -1116,6 +1116,15 @@ } static void +mac_test_create_mbuf_from_inpcb(struct inpcb *inp, struct label *inplabel, + struct mbuf *m, struct label *mlabel) +{ + + ASSERT_INPCB_LABEL(inplabel); + ASSERT_MBUF_LABEL(mlabel); +} + +static void mac_test_create_mbuf_from_mbuf(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct mbuf *newmbuf, struct label *newmbuflabel) @@ -2373,6 +2382,7 @@ .mpo_create_datagram_from_ipq = mac_test_create_datagram_from_ipq, .mpo_create_fragment = mac_test_create_fragment, .mpo_create_ipq = mac_test_create_ipq, + .mpo_create_mbuf_from_inpcb = mac_test_create_mbuf_from_inpcb, .mpo_create_mbuf_from_mbuf = mac_test_create_mbuf_from_mbuf, .mpo_create_mbuf_linklayer = mac_test_create_mbuf_linklayer, .mpo_create_mbuf_from_bpfdesc = mac_test_create_mbuf_from_bpfdesc, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#258 (text+ko) ==== @@ -248,6 +248,7 @@ void mac_create_ipq(struct mbuf *fragment, struct ipq *ipq); void mac_create_datagram_from_ipq(struct ipq *ipq, struct mbuf *datagram); void mac_create_fragment(struct mbuf *datagram, struct mbuf *fragment); +void mac_create_mbuf_from_inpcb(struct inpcb *inp, struct mbuf *m); void mac_create_mbuf_from_mbuf(struct mbuf *oldmbuf, struct mbuf *newmbuf); void mac_create_mbuf_linklayer(struct ifnet *ifnet, struct mbuf *m); void mac_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct mbuf *m); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#207 (text+ko) ==== @@ -261,6 +261,9 @@ void (*mpo_create_fragment)(struct mbuf *datagram, struct label *datagramlabel, struct mbuf *fragment, struct label *fragmentlabel); + void (*mpo_create_mbuf_from_inpcb)(struct inpcb *inp, + struct label *inplabel, struct mbuf *m, + struct label *mlabel); void (*mpo_create_mbuf_from_mbuf)(struct mbuf *oldmbuf, struct label *oldlabel, struct mbuf *newmbuf, struct label *newlabel); From owner-p4-projects@FreeBSD.ORG Tue Dec 16 15:32:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41C0B16A4D0; Tue, 16 Dec 2003 15:32:06 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1B5AB16A4CE for ; Tue, 16 Dec 2003 15:32:06 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 73F6243D36 for ; Tue, 16 Dec 2003 15:32:03 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBGNW30B045904 for ; Tue, 16 Dec 2003 15:32:03 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBGNW384045901 for perforce@freebsd.org; Tue, 16 Dec 2003 15:32:03 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 16 Dec 2003 15:32:03 -0800 (PST) Message-Id: <200312162332.hBGNW384045901@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 Subject: PERFORCE change 43987 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Dec 2003 23:32:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=43987 Change 43987 by sam@sam_ebb on 2003/12/16 15:31:05 o correct exit case in soreceive to unlock the socket buffer o don't sbunlock in soreceive when restarting when no data has been transferred (note this is correct as previously we unlocked the sockbuf whenever we blocked but now we keep the sockbuf locked for the duration of a receive which means receives on a socket are single-threaded) Affected files ... .. //depot/projects/netperf+sockets/sys/kern/uipc_socket.c#6 edit Differences ... ==== //depot/projects/netperf+sockets/sys/kern/uipc_socket.c#6 (text+ko) ==== @@ -889,7 +889,7 @@ SBLASTMBUFCHK(&so->so_rcv); error = sbwait(&so->so_rcv); if (error) - goto out; + goto release; goto restart; } dontblock: @@ -1131,10 +1131,8 @@ (*pr->pr_usrreqs->pru_rcvd)(so, flags); } if (orig_resid == uio->uio_resid && orig_resid && - (flags & MSG_EOR) == 0 && (so->so_state & SS_CANTRCVMORE) == 0) { - sbunlock(&so->so_rcv); + (flags & MSG_EOR) == 0 && (so->so_state & SS_CANTRCVMORE) == 0) goto restart; - } if (flagsp) *flagsp |= flags; From owner-p4-projects@FreeBSD.ORG Tue Dec 16 19:41:37 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDDF816A4D0; Tue, 16 Dec 2003 19:41:36 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B313716A4CE for ; Tue, 16 Dec 2003 19:41:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B072943D6A for ; Tue, 16 Dec 2003 19:41:07 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBH3f70B065341 for ; Tue, 16 Dec 2003 19:41:07 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBH3f7eW065338 for perforce@freebsd.org; Tue, 16 Dec 2003 19:41:07 -0800 (PST) (envelope-from sam@freebsd.org) Date: Tue, 16 Dec 2003 19:41:07 -0800 (PST) Message-Id: <200312170341.hBH3f7eW065338@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 Subject: PERFORCE change 43995 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Dec 2003 03:41:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=43995 Change 43995 by sam@sam_ebb on 2003/12/16 19:40:09 must release lock when sleeping Affected files ... .. //depot/projects/netperf+sockets/sys/kern/uipc_socket.c#7 edit Differences ... ==== //depot/projects/netperf+sockets/sys/kern/uipc_socket.c#7 (text+ko) ==== @@ -377,7 +377,7 @@ (so->so_state & SS_NBIO)) goto drop; while (so->so_state & SS_ISCONNECTED) { - error = tsleep(&so->so_timeo, + error = msleep(&so->so_timeo, SOCK_MTX(so), PSOCK | PCATCH, "soclos", so->so_linger * hz); if (error) break; From owner-p4-projects@FreeBSD.ORG Wed Dec 17 06:06:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7962D16A4D0; Wed, 17 Dec 2003 06:06:32 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5155216A4CE for ; Wed, 17 Dec 2003 06:06:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1AE5E43D4F for ; Wed, 17 Dec 2003 06:03:51 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBHE3o0B018053 for ; Wed, 17 Dec 2003 06:03:50 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBHE3o54018050 for perforce@freebsd.org; Wed, 17 Dec 2003 06:03:50 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Wed, 17 Dec 2003 06:03:50 -0800 (PST) Message-Id: <200312171403.hBHE3o54018050@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 44013 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Dec 2003 14:06:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=44013 Change 44013 by cvance@cvance_sony on 2003/12/17 06:03:24 Remove old sebsd policy. It's incompatible with the current security server and doesn't build anymore. Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#5 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/assert.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/attrib.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/constraints#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/admin.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/httpadm.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/misc/kernel.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/misc/kmod.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/misc/tcpmux.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/acct.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/amanda.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/apache.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/apmd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/at.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/atd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/atrun.te#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/authbind.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/automount.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/backup.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/bootloader.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/cardmgr.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/cleanvar.te#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/courier.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/crack.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/crond.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/crontab.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/cups.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ddt-client.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/devfsd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/dhcpc.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/dhcpd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/dictd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/dpkg.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/fsadm.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ftpd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/gatekeeper.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/getty.te#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/gnome-pty-helper.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/gpg.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/gpm.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/hotplug.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/hwclock.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ifconfig.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/inetd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/init.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/initrc.te#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ipchains.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ipsec.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/klogd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ldconfig.te#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/login.te#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/logrotate.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/lpd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/lpr.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/mail.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/modutil.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/mount.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/moused.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/named.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/netscape.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/netutils.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/newrole.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/nscd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ntpd.te#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/passwd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ping.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/portmap.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/portslave.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/postfix.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/pppd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/procmail.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/pump.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/qmail.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/quota.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/radius.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/radvd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/rlogind.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/rpcd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/rpm.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/rshd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/run_deb.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/run_init.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/save-entropy.te#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/selopt.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/sendmail.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/setfiles.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/slapd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/snmpd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/snort.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/sound.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/speedmgmt.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/squid.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ssh.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/sshd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/su.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/sxid.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/syslogd.te#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/sysstat.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/tcpd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/tftpd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/traceroute.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/usbd.te#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/usbmodules.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/utempter.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/vmware.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/watchdog.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/xdm.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/xfs.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/xserver.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ypbind.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_capable_file.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_capable_net.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_capable_sys.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_entrypoint.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_execshare.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_exectrace.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_execute_no_trans.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_fdreceive.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_file.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_global.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_inherit.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_ioctl.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_ipc.te#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_link.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_mkdir.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_open.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_ptrace.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_readlink.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_relabel.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_rename.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_rxdir.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_setattr.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_setnice.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_sigkill.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_socket.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_stat.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_sysctl.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_system_misc.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_task_create.te#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_task_getpgid.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_task_getsched.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_task_getsid.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_task_setpgid.te#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_task_setsched.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_transition.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/test/test_wait.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/user.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/acct.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/apache.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/apmd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/atd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/atrun.fc#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/authbind.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/automount.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/backup.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/bootloader.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/cardmgr.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/courier.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/crack.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/crond.fc#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/crontab.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/cups.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ddt-client.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/devfsd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/dhcpc.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/dhcpd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/dictd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/dpkg.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/fsadm.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ftpd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/gatekeeper.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/getty.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/gnome-pty-helper.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/gpg.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/gpm.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/hotplug.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/hwclock.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ifconfig.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/inetd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/init.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/initrc.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ipchains.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ipsec.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/kernel.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/klogd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/kmod.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ldconfig.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/login.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/logrotate.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/lpd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/lpr.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/mail.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/modutil.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/mount.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/moused.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/named.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/netscape.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/netutils.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/newrole.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/nscd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ntpd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/opie.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/passwd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ping.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/portmap.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/portslave.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/postfix.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/pppd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/procmail.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/pump.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/qmail.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/quota.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/radius.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/radvd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/rlogind.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/rpcd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/rpm.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/rshd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/run_deb.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/run_init.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/save-entropy.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/selopt.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/sendmail.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/setfiles.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/shell.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/slapd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/snmpd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/snort.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/sound.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/speedmgmt.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/squid.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ssh.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/sshd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/su.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/sxid.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/syslogd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/sysstat.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/tcpd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/tftpd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/traceroute.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/usbd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/usbmodules.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/utempter.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/vmware.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/watchdog.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/xdm.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/xfs.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/xserver.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ypbind.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/types.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/files.lst#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/access_vectors#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/initial_sids#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/security_classes#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/fs_use#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/genfs_contexts#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/initial_sid_contexts#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/admin_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/global_macros.te#4 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/at_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/crond_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/crontab_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/gpg_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/gph_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/lpr_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/netscape_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/sendmail_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/ssh_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/su_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/xserver_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/user_macros.te#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/mls#3 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/net_contexts#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/rbac#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/test.mk#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/test_attrib.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/device.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/devpts.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/file.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/network.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/nfs.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/procfs.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/security.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/users#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/users.distrib#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Dec 17 06:26:20 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A055416A4D0; Wed, 17 Dec 2003 06:26:20 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7ABF916A4CE for ; Wed, 17 Dec 2003 06:26:20 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ABE3443D1F for ; Wed, 17 Dec 2003 06:26:18 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBHEQI0B018902 for ; Wed, 17 Dec 2003 06:26:18 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBHEQINn018899 for perforce@freebsd.org; Wed, 17 Dec 2003 06:26:18 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Wed, 17 Dec 2003 06:26:18 -0800 (PST) Message-Id: <200312171426.hBHEQINn018899@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 44014 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Dec 2003 14:26:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=44014 Change 44014 by cvance@cvance_korben on 2003/12/17 06:25:17 Fix policy for sendmail (take /usr/sbin/mailwrapper into consideration) Affected files ... .. //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/mta.te#2 edit .. //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/mta.fc#2 edit Differences ... ==== //depot/projects/trustedbsd/sebsd_policy/policy/domains/program/unused/mta.te#2 (text+ko) ==== @@ -25,6 +25,9 @@ domain_auto_trans(initrc_t, sendmail_exec_t, system_mail_t) ') +# allow mailwrapper to execute sendmail binaries +allow sendmail_t sendmail_exec_t:file execute_no_trans; + # allow the sysadmin to do "mail someone < /home/user/whatever" allow sysadm_mail_t user_home_dir_type:dir search; r_dir_file(sysadm_mail_t, user_home_type) ==== //depot/projects/trustedbsd/sebsd_policy/policy/file_contexts/program/mta.fc#2 (text+ko) ==== @@ -1,5 +1,7 @@ # types for general mail servers /usr/sbin/sendmail(.sendmail)? system_u:object_r:sendmail_exec_t +/usr/sbin/mailwrapper system_u:object_r:sendmail_exec_t +/usr/libexec/sendmail/sendmail system_u:object_r:sendmail_exec_t /etc/aliases system_u:object_r:etc_aliases_t /etc/aliases\.db system_u:object_r:etc_aliases_t /var/spool/mail(/.*)? system_u:object_r:mail_spool_t From owner-p4-projects@FreeBSD.ORG Wed Dec 17 07:00:33 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 208CA16A4D0; Wed, 17 Dec 2003 07:00:33 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EB72616A4CE for ; Wed, 17 Dec 2003 07:00:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F6A343D4F for ; Wed, 17 Dec 2003 06:55:55 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBHEtt0B020130 for ; Wed, 17 Dec 2003 06:55:55 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBHEttJX020111 for perforce@freebsd.org; Wed, 17 Dec 2003 06:55:55 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Wed, 17 Dec 2003 06:55:55 -0800 (PST) Message-Id: <200312171455.hBHEttJX020111@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 44016 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Dec 2003 15:00:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=44016 Change 44016 by cvance@cvance_sony on 2003/12/17 06:55:09 Integ policy from sebsd_policy Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/policy/COPYING#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/ChangeLog#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/README#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/VERSION#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/appconfig/default_contexts#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/appconfig/default_type#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/appconfig/initrc_context#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/assert.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/attrib.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/constraints#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/admin.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/httpadm.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/misc/kernel.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/misc/unused/auth-net.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/misc/unused/fcron.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/misc/unused/startx.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/atrun.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/checkpolicy.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/chkpwd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/cleanvar.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/crond.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/crontab.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/dhcpc.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/fsadm.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/getty.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/ifconfig.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/init.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/initrc.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/klogd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/ldconfig.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/load_policy.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/login.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/logrotate.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/lpd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/lpr.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/modutil.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/mount.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/mta.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/netutils.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/newrole.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/passwd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/rpcd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/save-entropy.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/sendmail.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/setfiles.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/ssh.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/su.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/syslogd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/tmpreaper.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/acct.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/amanda.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/amavis.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/apache.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/apmd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/atd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/authbind.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/automount.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/backup.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/bootloader.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/calamaris.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/cardmgr.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/chroot.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/clamav.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/courier.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/crack.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/cups.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/cvs.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/ddt-client.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/devfsd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/dhcpc.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/dhcpd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/dictd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/dpkg.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/fingerd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/ftpd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/games.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/gatekeeper.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/gnome-pty-helper.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/gpg.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/gpm.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/hotplug.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/hwclock.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/inetd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/ipchains.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/ipsec.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/irc.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/ircd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/kcheckpass.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/lpd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/lpr.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/mailman.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/mrtg.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/mta.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/mysqld.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/named.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/nessusd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/netsaint.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/netscape.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/nscd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/nsd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/ntpd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/oav-update.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/openca-ca.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/pamconsole.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/perdition.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/ping.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/portmap.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/portslave.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/postfix.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/postgresql.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/pppd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/procmail.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/pump.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/qmail.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/quota.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/radius.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/radvd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/rlogind.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/rpcd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/rpm.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/rshd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/samba.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/scannerdaemon.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/screen.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/selopt.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/sendmail.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/slapd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/snmpd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/snort.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/sound.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/speedmgmt.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/squid.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/sxid.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/sysstat.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/tcpd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/tftpd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/traceroute.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/transproxy.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/usbmodules.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/utempter.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/vmware.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/watchdog.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/xauth.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/xdm.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/xfs.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/xserver.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/ypbind.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/usbd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/useradd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/user.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/acct.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/amanda.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/amavis.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/apache.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/apmd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/atd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/atrun.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/authbind.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/automount.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/backup.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/bootloader.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/calamaris.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/cardmgr.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/checkpolicy.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/chkpwd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/chroot.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/clamav.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/cleanvar.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/courier.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/crack.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/crond.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/crontab.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/cups.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/cvs.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/ddt-client.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/devfsd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/dhcpc.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/dhcpd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/dictd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/dpkg.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/fingerd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/fsadm.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/ftpd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/games.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/gatekeeper.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/getty.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/gnome-pty-helper.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/gpg.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/gpm.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/groupadd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/hotplug.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/hwclock.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/ifconfig.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/inetd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/init.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/initrc.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/ipchains.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/ipsec.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/irc.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/ircd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/kcheckpass.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/klogd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/ldconfig.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/load_policy.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/login.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/logrotate.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/lpd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/lpr.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/mailman.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/modutil.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/mount.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/mrtg.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/mta.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/mysqld.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/named.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/nessusd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/netsaint.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/netscape.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/netutils.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/newrole.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/nscd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/nsd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/ntpd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/oav-update.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/openca-ca.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/openca-common.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/pamconsole.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/passwd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/perdition.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/ping.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/portmap.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/portslave.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/postfix.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/postgresql.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/pppd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/procmail.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/pump.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/qmail.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/quota.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/radius.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/radvd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/rlogind.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/rpcd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/rpm.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/rshd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/samba.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/save-entropy.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/scannerdaemon.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/screen.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/sendmail.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/setfiles.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/slapd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/snmpd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/snort.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/sound.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/speedmgmt.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/squid.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/ssh.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/su.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/sxid.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/syslogd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/sysstat.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/tcpd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/tftpd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/tmpreaper.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/traceroute.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/transproxy.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/usbd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/usbmodules.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/useradd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/utempter.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/vmware.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/watchdog.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/xauth.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/xdm.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/xfs.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/xserver.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/ypbind.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/runtime.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/types.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/flask/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/flask/access_vectors#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/flask/initial_sids#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/flask/mkaccess_vector.sh#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/flask/mkflask.sh#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/flask/security_classes#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/fs_use#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/genfs_contexts#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/initial_sid_contexts#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/admin_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/global_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/chkpwd_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/chroot_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/clamav_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/crond_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/crontab_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/cvs_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/fingerd_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/gpg_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/gph_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/irc_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/lpr_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/mount_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/mta_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/netscape_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/run_program_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/screen_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/sendmail_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/ssh_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/su_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/x_client_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/xauth_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/xserver_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/selinux_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/user_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/mls#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/net_contexts#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/policy.spec#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/rbac#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/types/device.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/types/devpts.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/types/file.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/types/network.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/types/nfs.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/types/procfs.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/types/security.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/policy/users#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Dec 17 07:12:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B4AA16A4D0; Wed, 17 Dec 2003 07:12:13 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F1F0B16A4CE for ; Wed, 17 Dec 2003 07:12:12 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5679943D33 for ; Wed, 17 Dec 2003 07:02:04 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBHF240B022317 for ; Wed, 17 Dec 2003 07:02:04 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBHF23Q0022314 for perforce@freebsd.org; Wed, 17 Dec 2003 07:02:03 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Wed, 17 Dec 2003 07:02:03 -0800 (PST) Message-Id: <200312171502.hBHF23Q0022314@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 44018 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Dec 2003 15:12:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=44018 Change 44018 by cvance@cvance_sony on 2003/12/17 07:01:57 Ok, that was dumb. Put policy in the correct directory this time Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/policy/COPYING#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/ChangeLog#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/README#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/VERSION#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/appconfig/default_contexts#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/appconfig/default_type#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/appconfig/initrc_context#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/assert.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/attrib.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/constraints#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/admin.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/httpadm.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/misc/kernel.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/misc/unused/auth-net.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/misc/unused/fcron.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/misc/unused/startx.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/atrun.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/checkpolicy.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/chkpwd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/cleanvar.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/crond.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/crontab.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/fsadm.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/getty.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/ifconfig.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/init.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/initrc.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/klogd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/ldconfig.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/load_policy.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/login.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/logrotate.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/modutil.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/mount.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/netutils.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/newrole.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/passwd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/save-entropy.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/setfiles.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/ssh.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/su.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/syslogd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/tmpreaper.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/acct.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/amanda.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/amavis.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/apache.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/apmd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/atd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/authbind.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/automount.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/backup.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/bootloader.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/calamaris.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/cardmgr.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/chroot.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/clamav.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/courier.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/crack.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/cups.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/cvs.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/ddt-client.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/devfsd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/dhcpc.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/dhcpd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/dictd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/dpkg.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/fingerd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/ftpd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/games.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/gatekeeper.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/gnome-pty-helper.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/gpg.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/gpm.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/hotplug.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/hwclock.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/inetd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/ipchains.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/ipsec.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/irc.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/ircd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/kcheckpass.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/lpd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/lpr.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/mailman.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/mrtg.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/mta.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/mysqld.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/named.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/nessusd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/netsaint.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/netscape.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/nscd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/nsd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/ntpd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/oav-update.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/openca-ca.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/pamconsole.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/perdition.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/ping.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/portmap.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/portslave.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/postfix.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/postgresql.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/pppd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/procmail.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/pump.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/qmail.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/quota.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/radius.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/radvd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/rlogind.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/rpcd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/rpm.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/rshd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/samba.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/scannerdaemon.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/screen.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/selopt.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/sendmail.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/slapd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/snmpd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/snort.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/sound.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/speedmgmt.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/squid.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/sxid.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/sysstat.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/tcpd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/tftpd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/traceroute.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/transproxy.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/usbmodules.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/utempter.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/vmware.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/watchdog.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/xauth.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/xdm.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/xfs.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/xserver.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/unused/ypbind.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/usbd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/useradd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/user.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/acct.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/amanda.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/amavis.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/apache.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/apmd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/atd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/atrun.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/authbind.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/automount.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/backup.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/bootloader.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/calamaris.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/cardmgr.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/checkpolicy.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/chkpwd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/chroot.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/clamav.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/cleanvar.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/courier.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/crack.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/crond.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/crontab.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/cups.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/cvs.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/ddt-client.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/devfsd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/dhcpc.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/dhcpd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/dictd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/dpkg.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/fingerd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/fsadm.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/ftpd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/games.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/gatekeeper.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/getty.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/gnome-pty-helper.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/gpg.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/gpm.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/groupadd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/hotplug.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/hwclock.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/ifconfig.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/inetd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/init.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/initrc.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/ipchains.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/ipsec.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/irc.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/ircd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/kcheckpass.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/klogd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/ldconfig.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/load_policy.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/login.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/logrotate.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/lpd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/lpr.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/mailman.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/modutil.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/mount.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/mrtg.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/mta.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/mysqld.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/named.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/nessusd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/netsaint.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/netscape.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/netutils.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/newrole.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/nscd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/nsd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/ntpd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/oav-update.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/openca-ca.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/openca-common.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/pamconsole.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/passwd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/perdition.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/ping.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/portmap.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/portslave.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/postfix.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/postgresql.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/pppd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/procmail.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/pump.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/qmail.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/quota.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/radius.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/radvd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/rlogind.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/rpcd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/rpm.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/rshd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/samba.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/save-entropy.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/scannerdaemon.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/screen.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/sendmail.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/setfiles.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/slapd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/snmpd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/snort.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/sound.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/speedmgmt.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/squid.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/ssh.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/su.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/sxid.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/syslogd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/sysstat.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/tcpd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/tftpd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/tmpreaper.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/traceroute.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/transproxy.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/usbd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/usbmodules.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/useradd.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/utempter.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/vmware.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/watchdog.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/xauth.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/xdm.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/xfs.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/xserver.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/program/ypbind.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/runtime.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/file_contexts/types.fc#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/flask/Makefile#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/flask/access_vectors#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/flask/initial_sids#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/flask/mkaccess_vector.sh#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/flask/mkflask.sh#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/flask/security_classes#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/fs_use#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/genfs_contexts#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/initial_sid_contexts#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/admin_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/global_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/chkpwd_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/chroot_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/clamav_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/crond_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/crontab_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/cvs_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/fingerd_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/gpg_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/gph_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/irc_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/lpr_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/mount_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/mta_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/netscape_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/run_program_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/screen_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/sendmail_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/ssh_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/su_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/x_client_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/xauth_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/program/xserver_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/selinux_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/macros/user_macros.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/mls#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/net_contexts#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/policy.spec#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/rbac#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/types/device.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/types/devpts.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/types/file.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/types/network.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/types/nfs.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/types/procfs.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/types/security.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/users#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/COPYING#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/ChangeLog#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#6 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/README#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/VERSION#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/appconfig/default_contexts#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/appconfig/default_type#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/appconfig/initrc_context#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/assert.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/attrib.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/constraints#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/admin.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/httpadm.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/misc/kernel.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/misc/unused/auth-net.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/misc/unused/fcron.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/misc/unused/startx.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/atrun.te#4 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/checkpolicy.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/chkpwd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/cleanvar.te#4 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/crond.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/crontab.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/dhcpc.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/fsadm.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/getty.te#4 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ifconfig.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/init.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/initrc.te#4 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/klogd.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ldconfig.te#5 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/load_policy.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/login.te#4 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/logrotate.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/lpd.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/lpr.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/modutil.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/mount.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/mta.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/netutils.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/newrole.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/passwd.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/rpcd.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/save-entropy.te#5 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/sendmail.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/setfiles.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ssh.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/su.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/syslogd.te#4 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/tmpreaper.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/acct.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/amanda.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/amavis.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/apache.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/apmd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/atd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/authbind.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/automount.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/backup.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/bootloader.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/calamaris.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/cardmgr.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/chroot.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/clamav.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/courier.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/crack.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/cups.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/cvs.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/ddt-client.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/devfsd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/dhcpc.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/dhcpd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/dictd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/dpkg.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/fingerd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/ftpd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/games.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/gatekeeper.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/gnome-pty-helper.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/gpg.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/gpm.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/hotplug.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/hwclock.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/inetd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/ipchains.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/ipsec.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/irc.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/ircd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/kcheckpass.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/lpd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/lpr.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/mailman.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/mrtg.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/mta.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/mysqld.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/named.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/nessusd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/netsaint.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/netscape.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/nscd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/nsd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/ntpd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/oav-update.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/openca-ca.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/pamconsole.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/perdition.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/ping.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/portmap.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/portslave.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/postfix.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/postgresql.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/pppd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/procmail.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/pump.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/qmail.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/quota.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/radius.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/radvd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/rlogind.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/rpcd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/rpm.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/rshd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/samba.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/scannerdaemon.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/screen.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/selopt.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/sendmail.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/slapd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/snmpd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/snort.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/sound.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/speedmgmt.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/squid.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/sxid.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/sysstat.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/tcpd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/tftpd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/traceroute.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/transproxy.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/usbmodules.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/utempter.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/vmware.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/watchdog.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/xauth.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/xdm.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/xfs.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/xserver.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/unused/ypbind.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/usbd.te#4 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/useradd.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/user.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/acct.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/amanda.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/amavis.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/apache.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/apmd.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/atd.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/atrun.fc#4 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/authbind.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/automount.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/backup.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/bootloader.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/calamaris.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/cardmgr.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/checkpolicy.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/chkpwd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/chroot.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/clamav.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/cleanvar.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/courier.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/crack.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/crond.fc#4 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/crontab.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/cups.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/cvs.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ddt-client.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/devfsd.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/dhcpc.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/dhcpd.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/dictd.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/dpkg.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/fingerd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/fsadm.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ftpd.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/games.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/gatekeeper.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/getty.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/gnome-pty-helper.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/gpg.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/gpm.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/groupadd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/hotplug.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/hwclock.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ifconfig.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/inetd.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/init.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/initrc.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ipchains.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ipsec.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/irc.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ircd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/kcheckpass.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/klogd.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ldconfig.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/load_policy.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/login.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/logrotate.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/lpd.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/lpr.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/mailman.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/modutil.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/mount.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/mrtg.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/mta.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/mysqld.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/named.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/nessusd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/netsaint.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/netscape.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/netutils.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/newrole.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/nscd.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/nsd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ntpd.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/oav-update.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/openca-ca.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/openca-common.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/pamconsole.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/passwd.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/perdition.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ping.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/portmap.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/portslave.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/postfix.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/postgresql.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/pppd.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/procmail.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/pump.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/qmail.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/quota.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/radius.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/radvd.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/rlogind.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/rpcd.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/rpm.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/rshd.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/samba.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/save-entropy.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/scannerdaemon.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/screen.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/sendmail.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/setfiles.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/slapd.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/snmpd.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/snort.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/sound.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/speedmgmt.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/squid.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ssh.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/su.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/sxid.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/syslogd.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/sysstat.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/tcpd.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/tftpd.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/tmpreaper.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/traceroute.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/transproxy.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/usbd.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/usbmodules.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/useradd.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/utempter.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/vmware.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/watchdog.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/xauth.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/xdm.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/xfs.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/xserver.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/program/ypbind.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/runtime.fc#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/file_contexts/types.fc#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/Makefile#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/access_vectors#5 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/initial_sids#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/mkaccess_vector.sh#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/mkflask.sh#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/flask/security_classes#4 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/fs_use#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/genfs_contexts#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/initial_sid_contexts#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/admin_macros.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/global_macros.te#5 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/chkpwd_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/chroot_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/clamav_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/crond_macros.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/crontab_macros.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/cvs_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/fingerd_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/gpg_macros.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/gph_macros.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/irc_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/lpr_macros.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/mount_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/mta_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/netscape_macros.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/run_program_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/screen_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/sendmail_macros.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/ssh_macros.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/su_macros.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/x_client_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/xauth_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/program/xserver_macros.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/selinux_macros.te#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/macros/user_macros.te#4 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/mls#4 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/net_contexts#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/policy.spec#1 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/rbac#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/device.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/devpts.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/file.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/network.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/nfs.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/procfs.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/types/security.te#3 branch .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/users#3 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Dec 17 07:35:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6209016A4D0; Wed, 17 Dec 2003 07:35:48 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3225716A4CE for ; Wed, 17 Dec 2003 07:35:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 66A7043D46 for ; Wed, 17 Dec 2003 07:35:47 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBHFZl0B032240 for ; Wed, 17 Dec 2003 07:35:47 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBHFZk9V032237 for perforce@freebsd.org; Wed, 17 Dec 2003 07:35:46 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Wed, 17 Dec 2003 07:35:46 -0800 (PST) Message-Id: <200312171535.hBHFZk9V032237@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 44020 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Dec 2003 15:35:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=44020 Change 44020 by cvance@cvance_korben on 2003/12/17 07:35:34 Remove old symlinks Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/dhcpc.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/lpd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/lpr.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/mta.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/rpcd.te#2 delete .. //depot/projects/trustedbsd/sebsd/contrib/policy/domains/program/sendmail.te#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Dec 17 07:46:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CB8C16A4D0; Wed, 17 Dec 2003 07:46:02 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EF46216A4CE for ; Wed, 17 Dec 2003 07:46:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 21B5943D1F for ; Wed, 17 Dec 2003 07:46:01 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBHFk00B034254 for ; Wed, 17 Dec 2003 07:46:00 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBHFk0Ig034247 for perforce@freebsd.org; Wed, 17 Dec 2003 07:46:00 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Wed, 17 Dec 2003 07:46:00 -0800 (PST) Message-Id: <200312171546.hBHFk0Ig034247@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 44021 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Dec 2003 15:46:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=44021 Change 44021 by cvance@cvance_korben on 2003/12/17 07:45:19 More policy cleanups Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/apache.te#3 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/named.te#3 add .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ssh.te#4 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ssh.te#4 (text+ko) ==== @@ -14,7 +14,7 @@ allow $1 self:unix_dgram_socket create_socket_perms; allow $1 self:unix_stream_socket create_stream_socket_perms; allow $1 self:fifo_file { poll rw_file_perms }; -allow $1 self:process { fork sigchld setsched }; +allow $1 self:process { fork sigchld setsched signal }; allow $1 self:fd *; # Read system information files in /proc. @@ -165,6 +165,7 @@ # # sshd_login_t is the domain of a login process # spawned by sshd +read_locale(sshd_login_t); # Use the pty created by sshd allow sshd_login_t sshd_devpts_t:chr_file { setattr rw_file_perms poll }; From owner-p4-projects@FreeBSD.ORG Wed Dec 17 08:45:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DDB916A4D0; Wed, 17 Dec 2003 08:45:21 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 67F4516A4CE for ; Wed, 17 Dec 2003 08:45:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5024D43D5F for ; Wed, 17 Dec 2003 08:45:14 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBHGjE0B047743 for ; Wed, 17 Dec 2003 08:45:14 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBHGjDFN047740 for perforce@freebsd.org; Wed, 17 Dec 2003 08:45:13 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Wed, 17 Dec 2003 08:45:13 -0800 (PST) Message-Id: <200312171645.hBHGjDFN047740@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 44024 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Dec 2003 16:45:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=44024 Change 44024 by cvance@cvance_korben on 2003/12/17 08:44:18 Minor policy tweak Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ssh.te#5 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/domains/program/ssh.te#5 (text+ko) ==== @@ -117,6 +117,9 @@ undefine(`sshd_program_domain') type sshd_key_t, file_type, sysadmfile; +# Allow one-time passwords +allow sshd_t opiekey_t:file rw_file_perms; + # so a tunnel can point to another ssh tunnel... can_tcp_connect(sshd_t, sshd_t) From owner-p4-projects@FreeBSD.ORG Wed Dec 17 08:46:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2067716A4D0; Wed, 17 Dec 2003 08:46:17 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EF4A516A4CE for ; Wed, 17 Dec 2003 08:46:16 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27FD943D50 for ; Wed, 17 Dec 2003 08:46:16 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBHGkG0B047815 for ; Wed, 17 Dec 2003 08:46:16 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBHGkFus047812 for perforce@freebsd.org; Wed, 17 Dec 2003 08:46:15 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Wed, 17 Dec 2003 08:46:15 -0800 (PST) Message-Id: <200312171646.hBHGkFus047812@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 44025 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Dec 2003 16:46:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=44025 Change 44025 by jhb@jhb_laptop on 2003/12/17 08:45:32 A patch I've had on my laptop for ages to enable interrupt sources slightly earlier. Affected files ... .. //depot/projects/smpng/sys/kern/kern_intr.c#37 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_intr.c#37 (text+ko) ==== @@ -546,22 +546,20 @@ mtx_unlock(&Giant); } } + WITNESS_WARN(WARN_PANIC, NULL, "suspending ithread"); + mtx_assert(&Giant, MA_NOTOWNED); + if (ithd->it_enable != NULL) + ithd->it_enable(ithd->it_vector); + /* * Processed all our interrupts. Now get the sched * lock. This may take a while and it_need may get * set again, so we have to check it again. */ - WITNESS_WARN(WARN_PANIC, NULL, "suspending ithread"); - mtx_assert(&Giant, MA_NOTOWNED); mtx_lock_spin(&sched_lock); if (!ithd->it_need) { - /* - * Should we call this earlier in the loop above? - */ - if (ithd->it_enable != NULL) - ithd->it_enable(ithd->it_vector); - TD_SET_IWAIT(td); /* we're idle */ + TD_SET_IWAIT(td); p->p_stats->p_ru.ru_nvcsw++; CTR2(KTR_INTR, "%s: pid %d: done", __func__, p->p_pid); mi_switch(); From owner-p4-projects@FreeBSD.ORG Wed Dec 17 08:52:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 61C0816A4D0; Wed, 17 Dec 2003 08:52:25 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3BD2016A4CE for ; Wed, 17 Dec 2003 08:52:25 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2249B43D3F for ; Wed, 17 Dec 2003 08:52:24 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBHGqN0B055365 for ; Wed, 17 Dec 2003 08:52:23 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBHGqNsY055359 for perforce@freebsd.org; Wed, 17 Dec 2003 08:52:23 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Wed, 17 Dec 2003 08:52:23 -0800 (PST) Message-Id: <200312171652.hBHGqNsY055359@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 44026 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Dec 2003 16:52:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=44026 Change 44026 by jhb@jhb_laptop on 2003/12/17 08:51:27 Another (but untested) patch from my laptop that tries to cleanup the smp rendezvous code slightly in case sending an IPI doesn't force the caches on other CPUs to be up to date with no stale values. Basically, remove some bogus membars, add some appropriate ones, and add an extra wait at the beginning with membars to try and make sure we are up to date. Affected files ... .. //depot/projects/smpng/sys/kern/subr_smp.c#24 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_smp.c#24 (text+ko) ==== @@ -94,7 +94,7 @@ static void (*smp_rv_action_func)(void *arg); static void (*smp_rv_teardown_func)(void *arg); static void *smp_rv_func_arg; -static volatile int smp_rv_waiters[2]; +static volatile int smp_rv_waiters[3]; static struct mtx smp_rv_mtx; /* @@ -279,19 +279,23 @@ smp_rendezvous_action(void) { + /* Ensure we have up-to-date values. */ + atomic_add_acq_int(&smp_rv_waiters[0], 1); + while (smp_rv_waiters[0] < mp_ncpus) + ; /* nothing */ /* setup function */ if (smp_rv_setup_func != NULL) smp_rv_setup_func(smp_rv_func_arg); /* spin on entry rendezvous */ - atomic_add_int(&smp_rv_waiters[0], 1); - while (atomic_load_acq_int(&smp_rv_waiters[0]) < mp_ncpus) + atomic_add_int(&smp_rv_waiters[1], 1); + while (smp_rv_waiters[0] < mp_ncpus) ; /* nothing */ /* action function */ if (smp_rv_action_func != NULL) smp_rv_action_func(smp_rv_func_arg); /* spin on exit rendezvous */ - atomic_add_int(&smp_rv_waiters[1], 1); - while (atomic_load_acq_int(&smp_rv_waiters[1]) < mp_ncpus) + atomic_add_int(&smp_rv_waiters[2], 1); + while (smp_rv_waiters[1] < mp_ncpus) ; /* nothing */ /* teardown function */ if (smp_rv_teardown_func != NULL) @@ -323,8 +327,9 @@ smp_rv_action_func = action_func; smp_rv_teardown_func = teardown_func; smp_rv_func_arg = arg; - smp_rv_waiters[0] = 0; smp_rv_waiters[1] = 0; + smp_rv_waiters[2] = 0; + atomic_store_rel_int(&smp_rv_waiters[0], 0); /* signal other processors, which will enter the IPI with interrupts off */ ipi_all_but_self(IPI_RENDEZVOUS); From owner-p4-projects@FreeBSD.ORG Wed Dec 17 10:26:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02F7116A4CF; Wed, 17 Dec 2003 10:26:35 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B5F2116A4D1 for ; Wed, 17 Dec 2003 10:26:34 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 77DCA43D6A for ; Wed, 17 Dec 2003 10:26:20 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBHIQK0B076201 for ; Wed, 17 Dec 2003 10:26:20 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBHIQK9o076198 for perforce@freebsd.org; Wed, 17 Dec 2003 10:26:20 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Wed, 17 Dec 2003 10:26:20 -0800 (PST) Message-Id: <200312171826.hBHIQK9o076198@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 44032 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Dec 2003 18:26:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=44032 Change 44032 by jhb@jhb_laptop on 2003/12/17 10:25:26 - Don't need to use atomic_load_acq() to read stopped_cpus. - Use pause in the stopped_cpus spin loops. Affected files ... .. //depot/projects/smpng/sys/kern/subr_smp.c#25 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_smp.c#25 (text+ko) ==== @@ -219,8 +219,11 @@ ipi_selected(map, IPI_STOP); i = 0; - while ((atomic_load_acq_int(&stopped_cpus) & map) != map) { + while ((stopped_cpus & map) != map) { /* spin */ +#ifdef __i386__ + ia32_pause(); +#endif i++; #ifdef DIAGNOSTIC if (i == 100000) { @@ -260,8 +263,12 @@ atomic_store_rel_int(&started_cpus, map); /* wait for each to clear its bit */ - while ((atomic_load_acq_int(&stopped_cpus) & map) != 0) - ; /* nothing */ + while (stopped_cpus & map) != 0) { +#ifdef __i386__ + ia32_pause(); +#endif + /* nothing */ + } return 1; } From owner-p4-projects@FreeBSD.ORG Wed Dec 17 13:37:15 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6CEE16A4D0; Wed, 17 Dec 2003 13:37:14 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A221D16A4CE for ; Wed, 17 Dec 2003 13:37:14 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68CD043D39 for ; Wed, 17 Dec 2003 13:37:13 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBHLbD0B025778 for ; Wed, 17 Dec 2003 13:37:13 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBHLbDFh025775 for perforce@freebsd.org; Wed, 17 Dec 2003 13:37:13 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Wed, 17 Dec 2003 13:37:13 -0800 (PST) Message-Id: <200312172137.hBHLbDFh025775@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 44038 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Dec 2003 21:37:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=44038 Change 44038 by jhb@jhb_laptop on 2003/12/17 13:37:04 IFC just this file for now. Affected files ... .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#14 integrate Differences ... ==== //depot/projects/smpng/sys/kern/subr_taskqueue.c#14 (text+ko) ==== @@ -25,26 +25,24 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_taskqueue.c,v 1.20 2003/11/10 20:39:44 alfred Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_taskqueue.c,v 1.21 2003/12/17 21:13:04 jhb Exp $"); #include #include #include #include #include +#include #include #include #include #include -#include #include static MALLOC_DEFINE(M_TASKQUEUE, "taskqueue", "Task Queues"); - +static void *taskqueue_giant_ih; +static void *taskqueue_ih; static STAILQ_HEAD(taskqueue_list, taskqueue) taskqueue_queues; - -static void *taskqueue_ih; -static void *taskqueue_giant_ih; static struct mtx taskqueue_queues_mutex; static struct proc *taskqueue_thread_proc; @@ -124,14 +122,14 @@ mtx_lock(&taskqueue_queues_mutex); STAILQ_FOREACH(queue, &taskqueue_queues, tq_link) { mtx_lock(&queue->tq_mutex); - if (!strcmp(queue->tq_name, name)) { + if (strcmp(queue->tq_name, name) == 0) { mtx_unlock(&taskqueue_queues_mutex); return queue; } mtx_unlock(&queue->tq_mutex); } mtx_unlock(&taskqueue_queues_mutex); - return 0; + return NULL; } int From owner-p4-projects@FreeBSD.ORG Wed Dec 17 13:42:34 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13CCD16A4D0; Wed, 17 Dec 2003 13:42:34 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C73D316A4CE for ; Wed, 17 Dec 2003 13:42:33 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 584C843D45 for ; Wed, 17 Dec 2003 13:42:20 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBHLgJ0B027474 for ; Wed, 17 Dec 2003 13:42:20 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBHLgJko027465 for perforce@freebsd.org; Wed, 17 Dec 2003 13:42:19 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Wed, 17 Dec 2003 13:42:19 -0800 (PST) Message-Id: <200312172142.hBHLgJko027465@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 44039 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Dec 2003 21:42:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=44039 Change 44039 by jhb@jhb_laptop on 2003/12/17 13:41:47 Path I've had on my laptop for a while. Affected files ... .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#15 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_taskqueue.c#15 (text+ko) ==== @@ -121,12 +121,11 @@ mtx_lock(&taskqueue_queues_mutex); STAILQ_FOREACH(queue, &taskqueue_queues, tq_link) { - mtx_lock(&queue->tq_mutex); if (strcmp(queue->tq_name, name) == 0) { + mtx_lock(&queue->tq_mutex); mtx_unlock(&taskqueue_queues_mutex); return queue; } - mtx_unlock(&queue->tq_mutex); } mtx_unlock(&taskqueue_queues_mutex); return NULL; @@ -235,28 +234,23 @@ } static void -taskqueue_kthread(void *arg) +taskqueue_thread_loop(void *arg) { - struct mtx kthread_mutex; - - bzero(&kthread_mutex, sizeof(kthread_mutex)); - - mtx_init(&kthread_mutex, "taskqueue kthread", NULL, MTX_DEF); - - mtx_lock(&kthread_mutex); - for (;;) { - mtx_unlock(&kthread_mutex); + mtx_lock(&taskqueue_thread->tq_mutex); + while (STAILQ_EMPTY(&taskqueue_thread->tq_queue)) + msleep(taskqueue_thread, &taskqueue_thread->tq_mutex, + PWAIT, "-", 0); + mtx_unlock(&taskqueue_thread->tq_mutex); taskqueue_run(taskqueue_thread); - mtx_lock(&kthread_mutex); - msleep(&taskqueue_thread, &kthread_mutex, PWAIT, "tqthr", 0); } } static void taskqueue_thread_enqueue(void *context) { - wakeup(&taskqueue_thread); + mtx_assert(&taskqueue_thread->tq_mutex, MA_OWNED); + wakeup(taskqueue_thread); } TASKQUEUE_DEFINE(swi, taskqueue_swi_enqueue, 0, @@ -268,7 +262,7 @@ NULL, SWI_TQ_GIANT, 0, &taskqueue_giant_ih)); TASKQUEUE_DEFINE(thread, taskqueue_thread_enqueue, 0, - kthread_create(taskqueue_kthread, NULL, + kthread_create(taskqueue_thread_loop, NULL, &taskqueue_thread_proc, 0, 0, "taskqueue")); int From owner-p4-projects@FreeBSD.ORG Thu Dec 18 10:43:04 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01A4816A4D0; Thu, 18 Dec 2003 10:43:03 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA1C116A4CE for ; Thu, 18 Dec 2003 10:43:03 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3AE1543D46 for ; Thu, 18 Dec 2003 10:43:02 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBIIh10B030922 for ; Thu, 18 Dec 2003 10:43:01 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBIIh1BG030919 for perforce@freebsd.org; Thu, 18 Dec 2003 10:43:01 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Thu, 18 Dec 2003 10:43:01 -0800 (PST) Message-Id: <200312181843.hBIIh1BG030919@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 44069 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Dec 2003 18:43:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=44069 Change 44069 by cvance@cvance_sony on 2003/12/18 10:42:59 Remove Makefile (will be replaced by non-gmake-requiring version) Add list of files that would need to be installed Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#7 delete .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/files.lst#5 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Dec 18 10:44:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3416C16A4D0; Thu, 18 Dec 2003 10:44:06 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E956216A4CE for ; Thu, 18 Dec 2003 10:44:05 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4166E43D49 for ; Thu, 18 Dec 2003 10:44:04 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBIIi40B030988 for ; Thu, 18 Dec 2003 10:44:04 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBIIi3jL030985 for perforce@freebsd.org; Thu, 18 Dec 2003 10:44:03 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Thu, 18 Dec 2003 10:44:03 -0800 (PST) Message-Id: <200312181844.hBIIi3jL030985@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 44070 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Dec 2003 18:44:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=44070 Change 44070 by cvance@cvance_sony on 2003/12/18 10:43:17 Add bsd-make compliant Makefile Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#8 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Dec 18 11:07:34 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FD0016A4D0; Thu, 18 Dec 2003 11:07:34 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB35816A4CE for ; Thu, 18 Dec 2003 11:07:33 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 111E143D4B for ; Thu, 18 Dec 2003 11:07:33 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBIJ7W0B036073 for ; Thu, 18 Dec 2003 11:07:32 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBIJ7WL5036070 for perforce@freebsd.org; Thu, 18 Dec 2003 11:07:32 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Thu, 18 Dec 2003 11:07:32 -0800 (PST) Message-Id: <200312181907.hBIJ7WL5036070@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 44071 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Dec 2003 19:07:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=44071 Change 44071 by cvance@cvance_sony on 2003/12/18 11:06:53 Patch up install-src target Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#9 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#9 (text+ko) ==== @@ -99,5 +99,7 @@ clean: rm -f $(POLICYVER) policy.conf $(FC) tmp/* -install-src: +install-src: /etc/security/sebsd + -rm -rf $(INSTALLDIR)/policy.old + -mv $(INSTALLDIR)/policy $(INSTALLDIR)/policy.old cd ..; tar cf - policy | (cd $(INSTALLDIR); tar xf -) From owner-p4-projects@FreeBSD.ORG Thu Dec 18 11:25:57 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B3A916A4D0; Thu, 18 Dec 2003 11:25:57 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F0EF816A4CE for ; Thu, 18 Dec 2003 11:25:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2519D43D2D for ; Thu, 18 Dec 2003 11:25:56 -0800 (PST) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBIJPt0B040201 for ; Thu, 18 Dec 2003 11:25:55 -0800 (PST) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBIJPtX6040198 for perforce@freebsd.org; Thu, 18 Dec 2003 11:25:55 -0800 (PST) (envelope-from cvance@nailabs.com) Date: Thu, 18 Dec 2003 11:25:55 -0800 (PST) Message-Id: <200312181925.hBIJPtX6040198@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 44072 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Dec 2003 19:25:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=44072 Change 44072 by cvance@cvance_release on 2003/12/18 11:25:12 If rm -rf fails, it really is bad news Affected files ... .. //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#10 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/contrib/sebsd/policy/Makefile#10 (text+ko) ==== @@ -100,6 +100,6 @@ rm -f $(POLICYVER) policy.conf $(FC) tmp/* install-src: /etc/security/sebsd - -rm -rf $(INSTALLDIR)/policy.old + rm -rf $(INSTALLDIR)/policy.old -mv $(INSTALLDIR)/policy $(INSTALLDIR)/policy.old cd ..; tar cf - policy | (cd $(INSTALLDIR); tar xf -) From owner-p4-projects@FreeBSD.ORG Thu Dec 18 15:52:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6234816A4D0; Thu, 18 Dec 2003 15:52:21 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3E09416A4CE for ; Thu, 18 Dec 2003 15:52:21 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4DFAA43D1D for ; Thu, 18 Dec 2003 15:52:20 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBINqK0B003547 for ; Thu, 18 Dec 2003 15:52:20 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBINqJhI003541 for perforce@freebsd.org; Thu, 18 Dec 2003 15:52:19 -0800 (PST) (envelope-from sam@freebsd.org) Date: Thu, 18 Dec 2003 15:52:19 -0800 (PST) Message-Id: <200312182352.hBINqJhI003541@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 Subject: PERFORCE change 44078 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Dec 2003 23:52:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=44078 Change 44078 by sam@sam_ebb on 2003/12/18 15:51:22 several cleanups/fixups to bpfwrite: o eliminate use of static sockaddr; it was being manaaged wrong meaning subsequent writes might inherit bogus bits from a previous one o remove Giant locking around if_output call; not sure what this was supposed to do but it's not useful and Giant is already held because bpfwrite is only invoked from the VFS layer which already grabs Giant o add locking under #ifdef MAC to protect it's work Affected files ... .. //depot/projects/netperf+sockets/sys/net/bpf.c#3 edit Differences ... ==== //depot/projects/netperf+sockets/sys/net/bpf.c#3 (text+ko) ==== @@ -557,7 +557,7 @@ struct ifnet *ifp; struct mbuf *m; int error; - static struct sockaddr dst; + struct sockaddr dst; int datlen; if (d->bd_bif == 0) @@ -568,6 +568,7 @@ if (uio->uio_resid == 0) return (0); + bzero(&dst, sizeof(dst)); error = bpf_movein(uio, (int)d->bd_bif->bif_dlt, &m, &dst, &datlen); if (error) return (error); @@ -578,16 +579,13 @@ if (d->bd_hdrcmplt) dst.sa_family = pseudo_AF_HDRCMPLT; - mtx_lock(&Giant); #ifdef MAC + BPFD_LOCK(d); mac_create_mbuf_from_bpfdesc(d, m); + BPFD_UNLOCK(d); #endif - error = (*ifp->if_output)(ifp, m, &dst, (struct rtentry *)0); - mtx_unlock(&Giant); - /* - * The driver frees the mbuf. - */ - return (error); + /* NB: the driver frees the mbuf */ + return (*ifp->if_output)(ifp, m, &dst, (struct rtentry *)0); } /* From owner-p4-projects@FreeBSD.ORG Fri Dec 19 11:36:27 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CCC316A4D0; Fri, 19 Dec 2003 11:36:27 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D58BE16A4CE for ; Fri, 19 Dec 2003 11:36:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 07F0F43D36 for ; Fri, 19 Dec 2003 11:36:24 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBJJaN0B091109 for ; Fri, 19 Dec 2003 11:36:23 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBJJaNV5091106 for perforce@freebsd.org; Fri, 19 Dec 2003 11:36:23 -0800 (PST) (envelope-from sam@freebsd.org) Date: Fri, 19 Dec 2003 11:36:23 -0800 (PST) Message-Id: <200312191936.hBJJaNV5091106@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 Subject: PERFORCE change 44103 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Dec 2003 19:36:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=44103 Change 44103 by sam@sam_ebb on 2003/12/19 11:35:28 partially eliminate LOR between tcpcb and Giant by pushing Giant into prison_free; this doesn't fix the case where unix domain sockets are used in jails but does fix the normal case Affected files ... .. //depot/projects/netperf+sockets/sys/kern/kern_jail.c#2 edit .. //depot/projects/netperf+sockets/sys/kern/kern_prot.c#3 edit Differences ... ==== //depot/projects/netperf+sockets/sys/kern/kern_jail.c#2 (text+ko) ==== @@ -255,7 +255,7 @@ prison_free(struct prison *pr) { - mtx_assert(&Giant, MA_OWNED); + mtx_lock(&Giant); mtx_lock(&allprison_mtx); mtx_lock(&pr->pr_mtx); pr->pr_ref--; @@ -273,6 +273,7 @@ } mtx_unlock(&pr->pr_mtx); mtx_unlock(&allprison_mtx); + mtx_unlock(&Giant); } void ==== //depot/projects/netperf+sockets/sys/kern/kern_prot.c#3 (text+ko) ==== @@ -1752,7 +1752,6 @@ * allocate a uidinfo structure. */ mtx_unlock(mtxp); - mtx_lock(&Giant); if (cr->cr_uidinfo != NULL) uifree(cr->cr_uidinfo); if (cr->cr_ruidinfo != NULL) @@ -1766,7 +1765,6 @@ mac_destroy_cred(cr); #endif FREE(cr, M_CRED); - mtx_unlock(&Giant); } else { mtx_unlock(mtxp); } From owner-p4-projects@FreeBSD.ORG Fri Dec 19 11:43:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E73A116A4D0; Fri, 19 Dec 2003 11:43:34 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C0F9716A4CE for ; Fri, 19 Dec 2003 11:43:34 -0800 (PST) Received: from ebb.errno.com (ebb.errno.com [66.127.85.87]) by mx1.FreeBSD.org (Postfix) with ESMTP id D985043D4C for ; Fri, 19 Dec 2003 11:43:33 -0800 (PST) (envelope-from sam@errno.com) Received: from 66.127.85.91 ([66.127.85.91]) (authenticated bits=0) by ebb.errno.com (8.12.9/8.12.9) with ESMTP id hBJJhVHQ096754 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=NO) for ; Fri, 19 Dec 2003 11:43:33 -0800 (PST) (envelope-from sam@errno.com) From: Sam Leffler Organization: Errno Consulting To: Perforce Change Reviews Date: Fri, 19 Dec 2003 11:46:54 -0800 User-Agent: KMail/1.5.3 References: <200312191936.hBJJaNV5091106@repoman.freebsd.org> In-Reply-To: <200312191936.hBJJaNV5091106@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200312191146.54968.sam@errno.com> Subject: Re: PERFORCE change 44103 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Dec 2003 19:43:35 -0000 On Friday 19 December 2003 11:36 am, Sam Leffler wrote: > http://perforce.freebsd.org/chv.cgi?CH=44103 > > Change 44103 by sam@sam_ebb on 2003/12/19 11:35:28 > > partially eliminate LOR between tcpcb and Giant by pushing Giant > into prison_free; this doesn't fix the case where unix domain > sockets are used in jails but does fix the normal case s/unix domain/tcp/ From owner-p4-projects@FreeBSD.ORG Fri Dec 19 16:18:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D694116A4D0; Fri, 19 Dec 2003 16:18:10 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AFCCB16A4CE for ; Fri, 19 Dec 2003 16:18:10 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D9EBC43D36 for ; Fri, 19 Dec 2003 16:18:04 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBK0I40B058389 for ; Fri, 19 Dec 2003 16:18:04 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBK0I4Nt058386 for perforce@freebsd.org; Fri, 19 Dec 2003 16:18:04 -0800 (PST) (envelope-from sam@freebsd.org) Date: Fri, 19 Dec 2003 16:18:04 -0800 (PST) Message-Id: <200312200018.hBK0I4Nt058386@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 Subject: PERFORCE change 44105 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Dec 2003 00:18:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=44105 Change 44105 by sam@sam_ebb on 2003/12/19 16:17:28 Cleanup the mess I created when dealing with use as a module and add some additional fixups: o move mutex init/destroy logic to the module load/unload hooks; otherwise they are initialized twice when the code is statically configured in the kernel because the module load method gets invoked before the user application calls ip_mrouter_init o add a mutex to synchronize the module init/done operations; this sort of was done using the value of ip_mroute but X_ip_mrouter_done sets it to NULL very early on which can lead to a race against ip_mrouter_init--using the additional mutex means this is safe now o don't call ip_mrouter_reset from ip_mrouter_init; this now happens once at module load and X_ip_mrouter_done does the appropriate cleanup work to insure the data structures are in a consistent state so that a subsequent init operation inherits good state o cleanup debugging code so error conditions are signaled and to use __func__ o make the mrtdebug variable accessible as net.inet.ip.mrtdebug Thanks to juli for shaming me into fixing this. Affected files ... .. //depot/projects/netperf+sockets/sys/netinet/ip_mroute.c#4 edit Differences ... ==== //depot/projects/netperf+sockets/sys/netinet/ip_mroute.c#4 (text+ko) ==== @@ -74,6 +74,8 @@ #define DEBUG_EXPIRE 0x08 #define DEBUG_XMIT 0x10 #define DEBUG_PIM 0x20 +SYSCTL_INT(_net_inet_ip, OID_AUTO, mrtdebug, CTLFLAG_RW, + &mrtdebug, 0, "multicast routing debug control"); #define VIFI_INVALID ((vifi_t) -1) @@ -584,27 +586,8 @@ return 0; } -static void -ip_mrouter_reset(void) -{ - bzero((caddr_t)mfctable, sizeof(mfctable)); - MFC_LOCK_INIT(); - VIF_LOCK_INIT(); - bzero((caddr_t)nexpire, sizeof(nexpire)); - - pim_assert = 0; - mrt_api_config = 0; +static struct mtx mrouter_mtx; /* used to synch init/done work */ - callout_init(&expire_upcalls_ch, CALLOUT_MPSAFE); - - bw_upcalls_n = 0; - bzero((caddr_t)bw_meter_timers, sizeof(bw_meter_timers)); - callout_init(&bw_upcalls_ch, CALLOUT_MPSAFE); - callout_init(&bw_meter_ch, CALLOUT_MPSAFE); - - callout_init(&tbf_reprocess_ch, CALLOUT_MPSAFE); -} - /* * Enable multicast routing */ @@ -612,20 +595,32 @@ ip_mrouter_init(struct socket *so, int version) { if (mrtdebug) - log(LOG_DEBUG, "ip_mrouter_init: so_type = %d, pr_protocol = %d\n", + log(LOG_DEBUG, "%s: so_type = %d, pr_protocol = %d\n", __func__, so->so_type, so->so_proto->pr_protocol); - if (so->so_type != SOCK_RAW || so->so_proto->pr_protocol != IPPROTO_IGMP) + if (so->so_type != SOCK_RAW || so->so_proto->pr_protocol != IPPROTO_IGMP) { + if (mrtdebug) + log(LOG_DEBUG, "%s: invalid socket, type %u protocol %u\n", + __func__, so->so_type, so->so_proto->pr_protocol); return EOPNOTSUPP; + } - if (version != 1) + if (version != 1) { + if (mrtdebug) + log(LOG_DEBUG, "%s: bad version %u, expecting 1\n", + __func__, version); return ENOPROTOOPT; + } + + mtx_lock(&mrouter_mtx); - if (ip_mrouter != NULL) + if (ip_mrouter != NULL) { + if (mrtdebug) + log(LOG_DEBUG, "%s: already initialized\n", __func__); + mtx_unlock(&mrouter_mtx); return EADDRINUSE; + } - ip_mrouter_reset(); - callout_reset(&expire_upcalls_ch, EXPIRE_TIMEOUT, expire_upcalls, NULL); callout_reset(&bw_upcalls_ch, BW_UPCALLS_PERIOD, @@ -634,8 +629,10 @@ ip_mrouter = so; + mtx_unlock(&mrouter_mtx); + if (mrtdebug) - log(LOG_DEBUG, "ip_mrouter_init\n"); + log(LOG_DEBUG, "%s: done\n", __func__); return 0; } @@ -653,6 +650,18 @@ struct mfc *rt; struct rtdetq *rte; + if (mrtdebug) + log(LOG_DEBUG, "%s: start\n", __func__); + + mtx_lock(&mrouter_mtx); + + if (ip_mrouter == NULL) { + if (mrtdebug) + log(LOG_DEBUG, "%s: not initialized\n", __func__); + mtx_unlock(&mrouter_mtx); + return EINVAL; + } + /* * Detach/disable hooks to the reset of the system. */ @@ -690,7 +699,7 @@ bzero((caddr_t)viftable, sizeof(viftable)); numvifs = 0; pim_assert = 0; - VIF_LOCK_DESTROY(); + VIF_UNLOCK(); /* * Free all multicast forwarding cache entries. @@ -717,9 +726,10 @@ } } bzero((caddr_t)mfctable, sizeof(mfctable)); + bzero((caddr_t)nexpire, sizeof(nexpire)); bw_upcalls_n = 0; bzero(bw_meter_timers, sizeof(bw_meter_timers)); - MFC_LOCK_DESTROY(); + MFC_UNLOCK(); /* * Reset de-encapsulation cache @@ -730,8 +740,10 @@ reg_vif_num = VIFI_INVALID; #endif + mtx_unlock(&mrouter_mtx); + if (mrtdebug) - log(LOG_DEBUG, "ip_mrouter_done\n"); + log(LOG_DEBUG, "%s: end\n", __func__); return 0; } @@ -3352,16 +3364,34 @@ } #endif /* PIM */ +static void +ip_mrouter_reset(void) +{ + bzero((caddr_t)mfctable, sizeof(mfctable)); + bzero((caddr_t)nexpire, sizeof(nexpire)); + + pim_assert = 0; + mrt_api_config = 0; + + callout_init(&expire_upcalls_ch, CALLOUT_MPSAFE); + + bw_upcalls_n = 0; + bzero((caddr_t)bw_meter_timers, sizeof(bw_meter_timers)); + callout_init(&bw_upcalls_ch, CALLOUT_MPSAFE); + callout_init(&bw_meter_ch, CALLOUT_MPSAFE); + + callout_init(&tbf_reprocess_ch, CALLOUT_MPSAFE); +} + static int ip_mroute_modevent(module_t mod, int type, void *unused) { - int s; - switch (type) { case MOD_LOAD: - s = splnet(); + mtx_init(&mrouter_mtx, "mrouter initialization", NULL, MTX_DEF); + MFC_LOCK_INIT(); + VIF_LOCK_INIT(); ip_mrouter_reset(); - /* XXX synchronize setup */ ip_mcast_src = X_ip_mcast_src; ip_mforward = X_ip_mforward; ip_mrouter_done = X_ip_mrouter_done; @@ -3397,6 +3427,9 @@ legal_vif_num = NULL; mrt_ioctl = NULL; rsvp_input_p = NULL; + VIF_LOCK_DESTROY(); + MFC_LOCK_DESTROY(); + mtx_destroy(&mrouter_mtx); break; } return 0; From owner-p4-projects@FreeBSD.ORG Fri Dec 19 17:02:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A36316A4D0; Fri, 19 Dec 2003 17:02:14 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2B5CE16A4CE for ; Fri, 19 Dec 2003 17:02:14 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5903443D49 for ; Fri, 19 Dec 2003 17:01:59 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBK11x0B073579 for ; Fri, 19 Dec 2003 17:01:59 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBK11vSP073556 for perforce@freebsd.org; Fri, 19 Dec 2003 17:01:57 -0800 (PST) (envelope-from sam@freebsd.org) Date: Fri, 19 Dec 2003 17:01:57 -0800 (PST) Message-Id: <200312200101.hBK11vSP073556@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 Subject: PERFORCE change 44106 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Dec 2003 01:02:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=44106 Change 44106 by sam@sam_ebb on 2003/12/19 17:01:31 IFC @ 44105 Affected files ... .. //depot/projects/netperf+sockets/sys/contrib/dev/acpica/hwsleep.c#3 edit .. //depot/projects/netperf/sys/compat/ndis/cfg_var.h#2 integrate .. //depot/projects/netperf/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/netperf/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/netperf/sys/compat/ndis/subr_ndis.c#3 integrate .. //depot/projects/netperf/sys/conf/files#30 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi.c#15 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_cpu.c#10 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_pci_link.c#6 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_pcib.c#6 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/ahc_eisa.c#3 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/ahc_pci.c#7 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/ahd_pci.c#7 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic7770.c#3 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic79xx.c#3 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic79xx.h#3 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic79xx.seq#2 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic79xx_inline.h#2 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic79xx_osm.c#3 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic79xx_osm.h#3 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic79xx_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic7xxx.c#3 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic7xxx.h#2 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic7xxx.reg#2 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic7xxx.seq#2 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic7xxx_93cx6.c#3 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic7xxx_osm.h#3 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic7xxx_pci.c#5 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic_osm_lib.c#1 branch .. //depot/projects/netperf/sys/dev/aic7xxx/aic_osm_lib.h#1 branch .. //depot/projects/netperf/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#2 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aicasm/aicasm_scan.l#2 integrate .. //depot/projects/netperf/sys/dev/ata/ata-chipset.c#14 integrate .. //depot/projects/netperf/sys/dev/ata/ata-pci.h#8 integrate .. //depot/projects/netperf/sys/dev/ata/ata-queue.c#8 integrate .. //depot/projects/netperf/sys/dev/en/midway.c#4 integrate .. //depot/projects/netperf/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/netperf/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/netperf/sys/dev/ofw/ofw_disk.c#5 integrate .. //depot/projects/netperf/sys/dev/stg/tmc18c30.c#3 integrate .. //depot/projects/netperf/sys/dev/usb/ehci_pci.c#6 integrate .. //depot/projects/netperf/sys/dev/usb/if_aue.c#9 integrate .. //depot/projects/netperf/sys/dev/usb/ohci_pci.c#7 integrate .. //depot/projects/netperf/sys/dev/usb/umass.c#6 integrate .. //depot/projects/netperf/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/netperf/sys/dev/usb/usbdevs.h#8 integrate .. //depot/projects/netperf/sys/dev/usb/usbdevs_data.h#8 integrate .. //depot/projects/netperf/sys/dev/usb/uscanner.c#6 integrate .. //depot/projects/netperf/sys/dev/vinum/vinum.c#3 integrate .. //depot/projects/netperf/sys/dev/vinum/vinumconfig.c#4 integrate .. //depot/projects/netperf/sys/dev/vinum/vinumrevive.c#4 integrate .. //depot/projects/netperf/sys/fs/ntfs/ntfs_subr.c#4 integrate .. //depot/projects/netperf/sys/i386/i386/pmap.c#24 integrate .. //depot/projects/netperf/sys/i386/include/cpu.h#3 integrate .. //depot/projects/netperf/sys/ia64/ia32/ia32_signal.c#2 integrate .. //depot/projects/netperf/sys/ia64/ia64/machdep.c#22 integrate .. //depot/projects/netperf/sys/kern/sched_ule.c#21 integrate .. //depot/projects/netperf/sys/kern/subr_taskqueue.c#6 integrate .. //depot/projects/netperf/sys/kern/sysv_sem.c#7 integrate .. //depot/projects/netperf/sys/kern/uipc_mbuf.c#3 integrate .. //depot/projects/netperf/sys/kern/vfs_subr.c#13 integrate .. //depot/projects/netperf/sys/modules/crypto/Makefile#2 integrate .. //depot/projects/netperf/sys/netgraph/atm/uni/ng_uni.c#2 integrate .. //depot/projects/netperf/sys/netgraph/ng_bridge.c#3 integrate .. //depot/projects/netperf/sys/netgraph/ng_eiface.c#4 integrate .. //depot/projects/netperf/sys/netgraph/ng_eiface.h#3 integrate .. //depot/projects/netperf/sys/netgraph/ng_etf.c#3 integrate .. //depot/projects/netperf/sys/netgraph/ng_ether.c#5 integrate .. //depot/projects/netperf/sys/netgraph/ng_ether.h#2 integrate .. //depot/projects/netperf/sys/netgraph/ng_ksocket.c#3 integrate .. //depot/projects/netperf/sys/netgraph/ng_parse.c#2 integrate .. //depot/projects/netperf/sys/netgraph/ng_parse.h#3 integrate .. //depot/projects/netperf/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/netperf/sys/netinet/ip_fw2.c#22 integrate .. //depot/projects/netperf/sys/netinet/tcp_subr.c#14 integrate .. //depot/projects/netperf/sys/netinet6/ip6_output.c#28 integrate .. //depot/projects/netperf/sys/netipsec/ipsec_mbuf.c#4 integrate .. //depot/projects/netperf/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/netperf/sys/opencrypto/crmbuf.c#2 delete .. //depot/projects/netperf/sys/opencrypto/cryptodev.h#2 integrate .. //depot/projects/netperf/sys/opencrypto/cryptosoft.c#2 integrate .. //depot/projects/netperf/sys/powerpc/powerpc/pmap.c#7 integrate .. //depot/projects/netperf/sys/security/mac/mac_net.c#7 integrate .. //depot/projects/netperf/sys/security/mac_biba/mac_biba.c#8 integrate .. //depot/projects/netperf/sys/security/mac_lomac/mac_lomac.c#9 integrate .. //depot/projects/netperf/sys/security/mac_mls/mac_mls.c#7 integrate .. //depot/projects/netperf/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/netperf/sys/security/mac_test/mac_test.c#8 integrate .. //depot/projects/netperf/sys/sys/_null.h#2 integrate .. //depot/projects/netperf/sys/sys/mac.h#9 integrate .. //depot/projects/netperf/sys/sys/mac_policy.h#5 integrate .. //depot/projects/netperf/sys/sys/mbuf.h#10 integrate .. //depot/projects/netperf/sys/sys/param.h#13 integrate Differences ... ==== //depot/projects/netperf+sockets/sys/contrib/dev/acpica/hwsleep.c#3 (text+ko) ==== @@ -293,6 +293,7 @@ { UINT32 PM1AControl; UINT32 PM1BControl; + UINT32 PM1Control; ACPI_BIT_REGISTER_INFO *SleepTypeRegInfo; ACPI_BIT_REGISTER_INFO *SleepEnableRegInfo; UINT32 InValue; @@ -387,6 +388,8 @@ ACPI_FLUSH_CPU_CACHE (); + Retry = 1000; +re_write: Status = AcpiHwRegisterWrite (ACPI_MTX_DO_NOT_LOCK, ACPI_REGISTER_PM1A_CONTROL, PM1AControl); if (ACPI_FAILURE (Status)) { @@ -399,6 +402,19 @@ return_ACPI_STATUS (Status); } + Status = AcpiHwRegisterRead (ACPI_MTX_LOCK, ACPI_REGISTER_PM1_CONTROL, &PM1Control); + if (ACPI_FAILURE (Status)) + { + return_ACPI_STATUS (Status); + } + if (PM1Control != (PM1AControl | PM1BControl)) + { + if (Retry-- != 0) + goto re_write; + printf("%s: PM1Control %x PM1AControl %x PM1BControl %x\n", + __func__, PM1Control, PM1AControl, PM1BControl); + } + if (SleepState > ACPI_STATE_S3) { /* ==== //depot/projects/netperf/sys/compat/ndis/cfg_var.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/cfg_var.h,v 1.1 2003/12/11 22:34:37 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/cfg_var.h,v 1.2 2003/12/18 03:51:21 wpaul Exp $ */ #ifndef _CFG_VAR_H_ @@ -39,6 +39,7 @@ char *nc_cfgkey; char *nc_cfgdesc; char nc_val[256]; + int nc_idx; }; typedef struct ndis_cfg ndis_cfg; ==== //depot/projects/netperf/sys/compat/ndis/kern_ndis.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.3 2003/12/12 08:54:48 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.6 2003/12/18 03:51:21 wpaul Exp $"); #include #include @@ -76,6 +76,7 @@ void *, uint32_t); __stdcall static void ndis_statusdone_func(ndis_handle); __stdcall static void ndis_setdone_func(ndis_handle, ndis_status); +__stdcall static void ndis_getdone_func(ndis_handle, ndis_status); __stdcall static void ndis_resetdone_func(ndis_handle, ndis_status, uint8_t); /* @@ -122,6 +123,15 @@ } __stdcall static void +ndis_getdone_func(adapter, status) + ndis_handle adapter; + ndis_status status; +{ + printf ("Query done... %x\n", status); + return; +} + +__stdcall static void ndis_resetdone_func(adapter, status, addressingreset) ndis_handle adapter; ndis_status status; @@ -204,6 +214,10 @@ while(1) { if (vals->nc_cfgkey == NULL) break; + if (vals->nc_idx != sc->ndis_devidx) { + vals++; + continue; + } SYSCTL_ADD_STRING(&sc->ndis_ctx, SYSCTL_CHILDREN(sc->ndis_tree), OID_AUTO, vals->nc_cfgkey, @@ -309,11 +323,21 @@ { struct ndis_softc *sc; ndis_handle adapter; + ndis_packet *p; __stdcall ndis_return_handler returnfunc; if (arg == NULL || packet == NULL) return; + p = packet; + + /* Decrement refcount. */ + p->np_private.npp_count--; + + /* Release packet when refcount hits zero, otherwise return. */ + if (p->np_private.npp_count) + return; + sc = arg; returnfunc = sc->ndis_chars.nmc_return_packet_func; adapter = sc->ndis_block.nmb_miniportadapterctx; @@ -439,6 +463,7 @@ priv = &p->np_private; buf = priv->npp_head; + priv->npp_count = 0; for (buf = priv->npp_head; buf != NULL; buf = buf->nb_next) { if (buf == priv->npp_head) @@ -450,25 +475,15 @@ *m0 = NULL; return(ENOBUFS); } - - /* - * Note: there's some hackery going on here. We want - * to mate the mbufs to the buffers in the NDIS packet, - * but we don't mark the mbufs with the M_EXT flag to - * indicate external storage. This is because we don't - * want anything special done to free the buffers. - * Depending on the circumstances, the caller may want - * the entire packet to be released, buffers and all, - * by calling ndis_return_packet(), or ndis_free_packet(). - * We leave it up to the caller to do the MEXTADD() to - * set up the free mechanism in the first mbuf of the - * chain. - */ if (buf->nb_bytecount > buf->nb_size) m->m_len = buf->nb_size; else m->m_len = buf->nb_bytecount; m->m_data = buf->nb_mappedsystemva; + MEXTADD(m, m->m_data, m->m_len, ndis_return_packet, + p->np_rsvd[0], 0, EXT_NDIS); + m->m_ext.ext_buf = (void *)p; /* XXX */ + priv->npp_count++; totlen += m->m_len; if (m->m_flags & MT_HEADER) *m0 = m; @@ -524,7 +539,6 @@ for (m = m0; m != NULL; m = m->m_next) { if (m->m_len == NULL) continue; - buf = malloc(sizeof(ndis_buffer), M_DEVBUF, M_NOWAIT|M_ZERO); if (buf == NULL) { ndis_free_packet(*p); @@ -651,20 +665,11 @@ if (sc->ndis_tmaps == NULL) return(ENOMEM); - sc->ndis_mbufs = malloc(sizeof(struct mbuf) * sc->ndis_maxpkts, - M_DEVBUF, M_NOWAIT|M_ZERO); - - if (sc->ndis_mbufs == NULL) { - free(sc->ndis_tmaps, M_DEVBUF); - return(ENOMEM); - } - for (i = 0; i < sc->ndis_maxpkts; i++) { error = bus_dmamap_create(sc->ndis_ttag, 0, &sc->ndis_tmaps[i]); if (error) { free(sc->ndis_tmaps, M_DEVBUF); - free(sc->ndis_mbufs, M_DEVBUF); return(ENODEV); } } @@ -677,18 +682,24 @@ void *arg; { struct ndis_softc *sc; + struct mbuf *m; + ndis_packet *p = NULL; int i; sc = arg; for (i = 0; i < sc->ndis_maxpkts; i++) { - if (sc->ndis_mbufs[i] != NULL) - m_freem(sc->ndis_mbufs[i]); + if (sc->ndis_txarray[i] != NULL) { + p = sc->ndis_txarray[i]; + m = (struct mbuf *)p->np_rsvd[1]; + if (m != NULL) + m_freem(m); + ndis_free_packet(sc->ndis_txarray[i]); + } bus_dmamap_destroy(sc->ndis_ttag, sc->ndis_tmaps[i]); } free(sc->ndis_tmaps, M_DEVBUF); - free(sc->ndis_mbufs, M_DEVBUF); bus_dma_tag_destroy(sc->ndis_ttag); @@ -1041,6 +1052,7 @@ block->nmb_signature = (void *)0xcafebabe; block->nmb_setdone_func = ndis_setdone_func; + block->nmb_querydone_func = ndis_getdone_func; block->nmb_status_func = ndis_status_func; block->nmb_statusdone_func = ndis_statusdone_func; block->nmb_resetdone_func = ndis_resetdone_func; ==== //depot/projects/netperf/sys/compat/ndis/ndis_var.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.1 2003/12/11 22:34:37 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.2 2003/12/14 21:31:32 wpaul Exp $ */ #ifndef _NDIS_VAR_H_ @@ -814,14 +814,16 @@ struct ndis_packet { ndis_packet_private np_private; union { + /* For connectionless miniports. */ struct { uint8_t np_miniport_rsvd[2 * sizeof(void *)]; uint8_t np_wrapper_rsvd[2 * sizeof(void *)]; - } np_rsvd; + } np_clrsvd; + /* For de-serialized miniports */ struct { uint8_t np_miniport_rsvdex[3 * sizeof(void *)]; uint8_t np_wrapper_rsvdex[sizeof(void *)]; - } np_rsvdrx; + } np_dsrsvd; struct { uint8_t np_mac_rsvd[4 * sizeof(void *)]; } np_macrsvd; @@ -840,6 +842,9 @@ typedef struct ndis_packet ndis_packet; +/* mbuf ext type for NDIS */ +#define EXT_NDIS 0x999 + struct ndis_filterdbs { union { void *nf_ethdb; ==== //depot/projects/netperf/sys/compat/ndis/subr_ndis.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.5 2003/12/13 09:07:35 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.7 2003/12/16 18:56:33 wpaul Exp $"); /* * This file implements a translation layer between the BSD networking @@ -106,10 +106,18 @@ __stdcall static ndis_status ndis_setattr_ex(ndis_handle, ndis_handle, uint32_t, uint32_t, ndis_interface_type); __stdcall static void ndis_open_cfg(ndis_status *, ndis_handle *, ndis_handle); +__stdcall static void ndis_open_cfgbyidx(ndis_status *, ndis_handle, + uint32_t, ndis_unicode_string *, ndis_handle *); +__stdcall static void ndis_open_cfgbyname(ndis_status *, ndis_handle, + ndis_unicode_string *, ndis_handle *); static ndis_status ndis_encode_parm(ndis_miniport_block *, struct sysctl_oid *, ndis_parm_type, ndis_config_parm **); +static ndis_status ndis_decode_parm(ndis_miniport_block *, + ndis_config_parm *, char *); __stdcall static void ndis_read_cfg(ndis_status *, ndis_config_parm **, ndis_handle, ndis_unicode_string *, ndis_parm_type); +__stdcall static void ndis_write_cfg(ndis_status *, ndis_handle, + ndis_unicode_string *, ndis_config_parm *); __stdcall static void ndis_close_cfg(ndis_handle); __stdcall static void ndis_create_lock(ndis_spin_lock *); __stdcall static void ndis_destroy_lock(ndis_spin_lock *); @@ -184,6 +192,8 @@ __stdcall static uint8_t ndis_wait_event(ndis_event *, uint32_t); __stdcall static ndis_status ndis_unicode2ansi(ndis_ansi_string *, ndis_unicode_string *); +__stdcall static ndis_status ndis_ansi2unicode(ndis_unicode_string *, + ndis_ansi_string *); __stdcall static ndis_status ndis_assign_pcirsrc(ndis_handle, uint32_t, ndis_resource_list **); __stdcall static ndis_status ndis_register_intr(ndis_miniport_interrupt *, @@ -194,6 +204,7 @@ ndis_shutdown_handler); __stdcall static void ndis_deregister_shutdown(ndis_handle); __stdcall static uint32_t ndis_numpages(ndis_buffer *); +__stdcall static void ndis_buf_physpages(ndis_buffer *, uint32_t *); __stdcall static void ndis_query_bufoffset(ndis_buffer *, uint32_t *, uint32_t *); __stdcall static void ndis_sleep(uint32_t); @@ -211,8 +222,12 @@ void *, void *); __stdcall static void ndis_time(uint64_t *); __stdcall static void ndis_init_string(ndis_unicode_string **, char *); +__stdcall static void ndis_init_ansi_string(ndis_ansi_string *, char *); __stdcall static void ndis_free_string(ndis_unicode_string *); __stdcall static ndis_status ndis_remove_miniport(ndis_handle *); +__stdcall static void ndis_termwrap(ndis_handle, void *); +__stdcall static void ndis_get_devprop(ndis_handle, void *, void *, + void *, cm_resource_list *, cm_resource_list *); __stdcall static void dummy(void); @@ -312,6 +327,14 @@ return; } +__stdcall static void +ndis_termwrap(handle, syspec) + ndis_handle handle; + void *syspec; +{ + return; +} + __stdcall static ndis_status ndis_register_miniport(handle, characteristics, len) ndis_handle handle; @@ -404,6 +427,30 @@ return; } +__stdcall static void +ndis_open_cfgbyname(status, cfg, subkey, subhandle) + ndis_status *status; + ndis_handle cfg; + ndis_unicode_string *subkey; + ndis_handle *subhandle; +{ + *subhandle = cfg; + *status = NDIS_STATUS_SUCCESS; + return; +} + +__stdcall static void +ndis_open_cfgbyidx(status, cfg, idx, subkey, subhandle) + ndis_status *status; + ndis_handle cfg; + uint32_t idx; + ndis_unicode_string *subkey; + ndis_handle *subhandle; +{ + *status = NDIS_STATUS_FAILURE; + return; +} + static ndis_status ndis_encode_parm(block, oid, type, parm) ndis_miniport_block *block; @@ -508,6 +555,82 @@ return; } +static ndis_status +ndis_decode_parm(block, parm, val) + ndis_miniport_block *block; + ndis_config_parm *parm; + char *val; +{ + uint16_t *unicode; + ndis_unicode_string *ustr; + + unicode = (uint16_t *)&block->nmb_dummybuf; + + switch(parm->ncp_type) { + case ndis_parm_string: + ustr = &parm->ncp_parmdata.ncp_stringdata; + ndis_unicode_to_ascii(ustr->nus_buf, ustr->nus_len, &val); + break; + case ndis_parm_int: + sprintf(val, "%ul", parm->ncp_parmdata.ncp_intdata); + break; + case ndis_parm_hexint: + sprintf(val, "%xu", parm->ncp_parmdata.ncp_intdata); + break; + default: + return(NDIS_STATUS_FAILURE); + break; + } + return(NDIS_STATUS_SUCCESS); +} + +__stdcall static void +ndis_write_cfg(status, cfg, key, parm) + ndis_status *status; + ndis_handle cfg; + ndis_unicode_string *key; + ndis_config_parm *parm; +{ + char *keystr = NULL; + ndis_miniport_block *block; + struct ndis_softc *sc; + struct sysctl_oid *oidp; + struct sysctl_ctx_entry *e; + char val[256]; + + block = (ndis_miniport_block *)cfg; + sc = (struct ndis_softc *)block->nmb_ifp; + + ndis_unicode_to_ascii(key->nus_buf, key->nus_len, &keystr); + + /* Decode the parameter into a string. */ + *status = ndis_decode_parm(block, parm, val); + if (*status != NDIS_STATUS_SUCCESS) { + free(keystr, M_DEVBUF); + return; + } + + /* See if the key already exists. */ + + TAILQ_FOREACH(e, &sc->ndis_ctx, link) { + oidp = e->entry; + if (strcmp(oidp->oid_name, keystr) == 0) { + /* Found it, set the value. */ + strcpy((char *)oidp->oid_arg1, val); + free(keystr, M_DEVBUF); + return; + } + } + + /* Not found, add a new key with the specified value. */ + ndis_add_sysctl(sc, keystr, "(dynamically set key)", + val, CTLFLAG_RW); + + free(keystr, M_DEVBUF); + *status = NDIS_STATUS_SUCCESS; + return; +} + __stdcall static void ndis_close_cfg(cfg) ndis_handle cfg; @@ -1589,12 +1712,37 @@ __stdcall static ndis_status ndis_unicode2ansi(dstr, sstr) - ndis_ansi_string *dstr; - ndis_unicode_string *sstr; + ndis_ansi_string *dstr; + ndis_unicode_string *sstr; +{ + if (dstr == NULL || sstr == NULL) + return(NDIS_STATUS_FAILURE); + if (ndis_unicode_to_ascii(sstr->nus_buf, + sstr->nus_len, &dstr->nas_buf)) + return(NDIS_STATUS_FAILURE); + dstr->nas_len = dstr->nas_maxlen = strlen(dstr->nas_buf); + return (NDIS_STATUS_SUCCESS); +} + +__stdcall static ndis_status +ndis_ansi2unicode(dstr, sstr) + ndis_unicode_string *dstr; + ndis_ansi_string *sstr; { - ndis_unicode_to_ascii(sstr->nus_buf, sstr->nus_len, &dstr->nas_buf); - dstr->nas_len = strlen(dstr->nas_buf); - printf ("unicode 2 ansi...\n"); + char *str; + if (dstr == NULL || sstr == NULL) + return(NDIS_STATUS_FAILURE); + str = malloc(sstr->nas_len + 1, M_DEVBUF, M_NOWAIT); + if (str == NULL) + return(NDIS_STATUS_FAILURE); + strncpy(str, sstr->nas_buf, sstr->nas_len); + *(str + sstr->nas_len) = '\0'; + if (ndis_ascii_to_unicode(str, &dstr->nus_buf)) { + free(str, M_DEVBUF); + return(NDIS_STATUS_FAILURE); + } + dstr->nus_len = dstr->nus_maxlen = sstr->nas_len * 2; + free(str, M_DEVBUF); return (NDIS_STATUS_SUCCESS); } @@ -1691,6 +1839,15 @@ } __stdcall static void +ndis_buf_physpages(buf, pages) + ndis_buffer *buf; + uint32_t *pages; +{ + *pages = ndis_numpages(buf); + return; +} + +__stdcall static void ndis_query_bufoffset(buf, off, len) ndis_buffer *buf; uint32_t *off; @@ -1901,6 +2058,39 @@ } __stdcall static void +ndis_init_ansi_string(dst, src) + ndis_ansi_string *dst; + char *src; +{ + ndis_ansi_string *a; + + a = dst; + if (a == NULL) + return; + if (src == NULL) { + a->nas_len = a->nas_maxlen = 0; + a->nas_buf = NULL; + } else { + a->nas_buf = src; + a->nas_len = a->nas_maxlen = strlen(src); + } + + return; +} + +__stdcall static void ndis_get_devprop(adapter, phydevobj, + funcdevobj, nextdevobj, resources, transresources) + ndis_handle adapter; + void *phydevobj; + void *funcdevobj; + void *nextdevobj; + cm_resource_list *resources; + cm_resource_list *transresources; +{ + return; +} + +__stdcall static void dummy() { printf ("NDIS dummy called...\n"); @@ -1908,6 +2098,14 @@ } image_patch_table ndis_functbl[] = { + { "NdisGetBufferPhysicalArraySize", (FUNC)ndis_buf_physpages }, + { "NdisMGetDeviceProperty", (FUNC)ndis_get_devprop }, + { "NdisInitAnsiString", (FUNC)ndis_init_ansi_string }, + { "NdisWriteConfiguration", (FUNC)ndis_write_cfg }, + { "NdisAnsiStringToUnicodeString", (FUNC)ndis_ansi2unicode }, + { "NdisTerminateWrapper", (FUNC)ndis_termwrap }, + { "NdisOpenConfigurationKeyByName", (FUNC)ndis_open_cfgbyname }, + { "NdisOpenConfigurationKeyByIndex", (FUNC)ndis_open_cfgbyidx }, { "NdisMRemoveMiniport", (FUNC)ndis_remove_miniport }, { "NdisInitializeString", (FUNC)ndis_init_string }, { "NdisFreeString", (FUNC)ndis_free_string }, ==== //depot/projects/netperf/sys/conf/files#30 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.858 2003/12/07 04:41:11 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.859 2003/12/15 21:49:41 bms Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1570,7 +1570,6 @@ # crypto support opencrypto/cast.c optional crypto opencrypto/criov.c optional crypto -opencrypto/crmbuf.c optional crypto opencrypto/crypto.c optional crypto opencrypto/cryptodev.c optional cryptodev opencrypto/cryptosoft.c optional crypto ==== //depot/projects/netperf/sys/dev/acpica/acpi.c#15 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.109 2003/12/09 06:29:57 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.110 2003/12/18 03:25:22 njl Exp $ */ #include "opt_acpi.h" @@ -105,8 +105,8 @@ u_long count, u_int flags); static int acpi_release_resource(device_t bus, device_t child, int type, int rid, struct resource *r); -static u_int32_t acpi_isa_get_logicalid(device_t dev); -static u_int32_t acpi_isa_get_compatid(device_t dev); +static uint32_t acpi_isa_get_logicalid(device_t dev); +static int acpi_isa_get_compatid(device_t dev, uint32_t *cids, int count); static int acpi_isa_pnp_probe(device_t bus, device_t child, struct isa_pnp_id *ids); static void acpi_probe_children(device_t bus); @@ -800,12 +800,12 @@ | (PNP_HEXTONUM(s[6]) << 24) \ | (PNP_HEXTONUM(s[5]) << 28)) -static u_int32_t +static uint32_t acpi_isa_get_logicalid(device_t dev) { + ACPI_DEVICE_INFO *devinfo; + ACPI_BUFFER buf; ACPI_HANDLE h; - ACPI_DEVICE_INFO devinfo; - ACPI_BUFFER buf = {sizeof(devinfo), &devinfo}; ACPI_STATUS error; u_int32_t pnpid; ACPI_LOCK_DECL; @@ -817,50 +817,71 @@ /* Fetch and validate the HID. */ if ((h = acpi_get_handle(dev)) == NULL) - goto out; + return (0); + buf.Pointer = NULL; + buf.Length = ACPI_ALLOCATE_BUFFER; error = AcpiGetObjectInfo(h, &buf); if (ACPI_FAILURE(error)) - goto out; - if ((devinfo.Valid & ACPI_VALID_HID) == 0) - goto out; + return (0); + devinfo = (ACPI_DEVICE_INFO *)buf.Pointer; - pnpid = PNP_EISAID(devinfo.HardwareId.Value); + if ((devinfo->Valid & ACPI_VALID_HID) != 0) + pnpid = PNP_EISAID(devinfo->HardwareId.Value); -out: + AcpiOsFree(buf.Pointer); ACPI_UNLOCK; return_VALUE (pnpid); } -static u_int32_t -acpi_isa_get_compatid(device_t dev) +static int +acpi_isa_get_compatid(device_t dev, uint32_t *cids, int count) { + ACPI_DEVICE_INFO *devinfo; + ACPI_BUFFER buf; ACPI_HANDLE h; ACPI_STATUS error; - u_int32_t pnpid; + uint32_t *pnpid; + int valid, i; ACPI_LOCK_DECL; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); - pnpid = 0; + pnpid = cids; + valid = 0; ACPI_LOCK; - /* Fetch and validate the HID */ + /* Fetch and validate the CID */ if ((h = acpi_get_handle(dev)) == NULL) + return (0); + buf.Pointer = NULL; + buf.Length = ACPI_ALLOCATE_BUFFER; + error = AcpiGetObjectInfo(h, &buf); + if (ACPI_FAILURE(error)) + return (0); + devinfo = (ACPI_DEVICE_INFO *)buf.Pointer; + if ((devinfo->Valid & ACPI_VALID_CID) == 0) goto out; - if (ACPI_FAILURE(error = acpi_EvaluateInteger(h, "_CID", &pnpid))) - goto out; + + if (devinfo->CompatibilityId.Count < count) + count = devinfo->CompatibilityId.Count; + for (i = 0; i < count; i++) { + if (strncmp(devinfo->CompatibilityId.Id[i].Value, "PNP", 3) != 0) + continue; + *pnpid++ = PNP_EISAID(devinfo->CompatibilityId.Id[i].Value); + valid++; + } out: + AcpiOsFree(buf.Pointer); ACPI_UNLOCK; - return_VALUE (pnpid); + return_VALUE (valid); } - static int acpi_isa_pnp_probe(device_t bus, device_t child, struct isa_pnp_id *ids) { - int result; - u_int32_t lid, cid; + int result, cid_count, i; + uint32_t lid, cids[8]; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); @@ -873,17 +894,23 @@ /* Scan the supplied IDs for a match */ lid = acpi_isa_get_logicalid(child); - cid = acpi_isa_get_compatid(child); + cid_count = acpi_isa_get_compatid(child, cids, 8); while (ids && ids->ip_id) { - if (lid == ids->ip_id || cid == ids->ip_id) { + if (lid == ids->ip_id) { result = 0; goto out; } + for (i = 0; i < cid_count; i++) { + if (cids[i] == ids->ip_id) { + result = 0; + goto out; + } + } ids++; } out: - return_VALUE(result); + return_VALUE (result); } /* @@ -1092,28 +1119,34 @@ BOOLEAN acpi_DeviceIsPresent(device_t dev) { + ACPI_DEVICE_INFO *devinfo; ACPI_HANDLE h; - ACPI_DEVICE_INFO devinfo; - ACPI_BUFFER buf = {sizeof(devinfo), &devinfo}; + ACPI_BUFFER buf; ACPI_STATUS error; + int ret; ACPI_ASSERTLOCK; + ret = FALSE; if ((h = acpi_get_handle(dev)) == NULL) return (FALSE); + buf.Pointer = NULL; + buf.Length = ACPI_ALLOCATE_BUFFER; error = AcpiGetObjectInfo(h, &buf); if (ACPI_FAILURE(error)) return (FALSE); + devinfo = (ACPI_DEVICE_INFO *)buf.Pointer; /* If no _STA method, must be present */ - if ((devinfo.Valid & ACPI_VALID_STA) == 0) - return (TRUE); + if ((devinfo->Valid & ACPI_VALID_STA) == 0) + ret = TRUE; /* Return true for 'present' and 'functioning' */ - if ((devinfo.CurrentStatus & 0x9) == 0x9) - return (TRUE); + if ((devinfo->CurrentStatus & 0x9) == 0x9) + ret = TRUE; - return (FALSE); + AcpiOsFree(buf.Pointer); + return (ret); } /* @@ -1122,28 +1155,34 @@ BOOLEAN acpi_BatteryIsPresent(device_t dev) { + ACPI_DEVICE_INFO *devinfo; ACPI_HANDLE h; - ACPI_DEVICE_INFO devinfo; - ACPI_BUFFER buf = {sizeof(devinfo), &devinfo}; + ACPI_BUFFER buf; ACPI_STATUS error; + int ret; ACPI_ASSERTLOCK; + ret = FALSE; if ((h = acpi_get_handle(dev)) == NULL) return (FALSE); + buf.Pointer = NULL; + buf.Length = ACPI_ALLOCATE_BUFFER; error = AcpiGetObjectInfo(h, &buf); if (ACPI_FAILURE(error)) return (FALSE); + devinfo = (ACPI_DEVICE_INFO *)buf.Pointer; /* If no _STA method, must be present */ - if ((devinfo.Valid & ACPI_VALID_STA) == 0) - return (TRUE); + if ((devinfo->Valid & ACPI_VALID_STA) == 0) + ret = TRUE; /* Return true for 'present' and 'functioning' */ - if ((devinfo.CurrentStatus & 0x19) == 0x19) - return (TRUE); + if ((devinfo->CurrentStatus & 0x19) == 0x19) + ret = TRUE; - return (FALSE); + AcpiOsFree(buf.Pointer); + return (ret); } /* @@ -1152,31 +1191,40 @@ BOOLEAN acpi_MatchHid(device_t dev, char *hid) { + ACPI_DEVICE_INFO *devinfo; ACPI_HANDLE h; - ACPI_DEVICE_INFO devinfo; - ACPI_BUFFER buf = {sizeof(devinfo), &devinfo}; + ACPI_BUFFER buf; ACPI_STATUS error; - int cid; + int ret, i; ACPI_ASSERTLOCK; + ret = FALSE; if (hid == NULL) return (FALSE); if ((h = acpi_get_handle(dev)) == NULL) return (FALSE); + buf.Pointer = NULL; + buf.Length = ACPI_ALLOCATE_BUFFER; error = AcpiGetObjectInfo(h, &buf); if (ACPI_FAILURE(error)) return (FALSE); - if ((devinfo.Valid & ACPI_VALID_HID) != 0 && - strcmp(hid, devinfo.HardwareId.Value) == 0) - return (TRUE); + devinfo = (ACPI_DEVICE_INFO *)buf.Pointer; - if (ACPI_FAILURE(error = acpi_EvaluateInteger(h, "_CID", &cid))) - return (FALSE); - if (cid == PNP_EISAID(hid)) - return (TRUE); + if ((devinfo->Valid & ACPI_VALID_HID) != 0) { + if (strcmp(hid, devinfo->HardwareId.Value) == 0) + ret = TRUE; + } else if ((devinfo->Valid & ACPI_VALID_CID) != 0) { + for (i = 0; i < devinfo->CompatibilityId.Count; i++) { + if (strcmp(hid, devinfo->CompatibilityId.Id[i].Value) == 0) { + ret = TRUE; + break; + } + } + } - return (FALSE); + AcpiOsFree(buf.Pointer); + return (ret); } /* ==== //depot/projects/netperf/sys/dev/acpica/acpi_cpu.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.26 2003/12/12 19:42:16 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.27 2003/12/18 04:38:45 njl Exp $"); #include "opt_acpi.h" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Dec 19 17:06:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B4E616A4D0; Fri, 19 Dec 2003 17:06:19 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2CFDE16A4CE for ; Fri, 19 Dec 2003 17:06:19 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B72C643D1F for ; Fri, 19 Dec 2003 17:06:05 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBK1650B075196 for ; Fri, 19 Dec 2003 17:06:05 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBK164rJ075193 for perforce@freebsd.org; Fri, 19 Dec 2003 17:06:04 -0800 (PST) (envelope-from sam@freebsd.org) Date: Fri, 19 Dec 2003 17:06:04 -0800 (PST) Message-Id: <200312200106.hBK164rJ075193@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 Subject: PERFORCE change 44107 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Dec 2003 01:06:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=44107 Change 44107 by sam@sam_ebb on 2003/12/19 17:05:10 IFC Affected files ... .. //depot/projects/netperf+sockets/sys/compat/ndis/cfg_var.h#2 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/netperf+sockets/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/netperf+sockets/sys/conf/files#4 integrate .. //depot/projects/netperf+sockets/sys/conf/majors#3 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi_cpu.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi_pci_link.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/acpica/acpi_pcib.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/ahc_eisa.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/ahc_pci.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/ahd_pci.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/aic7770.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/aic79xx.seq#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/aic79xx_inline.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/aic7xxx.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/aic7xxx.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/aic7xxx.reg#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/aic7xxx.seq#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/aic7xxx_93cx6.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/aic_osm_lib.c#1 branch .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/aic_osm_lib.h#1 branch .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#2 integrate .. //depot/projects/netperf+sockets/sys/dev/aic7xxx/aicasm/aicasm_scan.l#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/netperf+sockets/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/ath/if_athioctl.h#3 integrate .. //depot/projects/netperf+sockets/sys/dev/bktr/msp34xx.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/en/midway.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/firewire/sbp_targ.c#4 integrate .. //depot/projects/netperf+sockets/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/netperf+sockets/sys/dev/md/md.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/ofw/ofw_disk.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/stg/tmc18c30.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/if_aue.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/ohci_pci.c#3 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/umass.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/usbdevs.h#3 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/usbdevs_data.h#3 integrate .. //depot/projects/netperf+sockets/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/vinum/vinum.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/vinum/vinumconfig.c#2 integrate .. //depot/projects/netperf+sockets/sys/dev/vinum/vinumrevive.c#2 integrate .. //depot/projects/netperf+sockets/sys/fs/ntfs/ntfs_subr.c#2 integrate .. //depot/projects/netperf+sockets/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/netperf+sockets/sys/i386/include/cpu.h#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia32/ia32_signal.c#2 integrate .. //depot/projects/netperf+sockets/sys/ia64/ia64/machdep.c#4 integrate .. //depot/projects/netperf+sockets/sys/kern/kern_switch.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/sched_ule.c#5 integrate .. //depot/projects/netperf+sockets/sys/kern/subr_taskqueue.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/sysv_sem.c#3 integrate .. //depot/projects/netperf+sockets/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/netperf+sockets/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/netperf+sockets/sys/modules/crypto/Makefile#2 integrate .. //depot/projects/netperf+sockets/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/netperf+sockets/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/netperf+sockets/sys/netgraph/atm/uni/ng_uni.c#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_bridge.c#3 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_eiface.c#3 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_eiface.h#3 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_etf.c#3 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_ether.c#3 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_ether.h#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_parse.c#2 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_parse.h#3 integrate .. //depot/projects/netperf+sockets/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/netperf+sockets/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/netperf+sockets/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/netperf+sockets/sys/netinet6/ip6_output.c#4 integrate .. //depot/projects/netperf+sockets/sys/netipsec/ipsec_mbuf.c#2 integrate .. //depot/projects/netperf+sockets/sys/nfsserver/nfs_srvsubs.c#2 integrate .. //depot/projects/netperf+sockets/sys/opencrypto/crmbuf.c#2 delete .. //depot/projects/netperf+sockets/sys/opencrypto/cryptodev.h#2 integrate .. //depot/projects/netperf+sockets/sys/opencrypto/cryptosoft.c#2 integrate .. //depot/projects/netperf+sockets/sys/powerpc/powerpc/pmap.c#3 integrate .. //depot/projects/netperf+sockets/sys/security/mac/mac_net.c#4 integrate .. //depot/projects/netperf+sockets/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/netperf+sockets/sys/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/netperf+sockets/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/netperf+sockets/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/netperf+sockets/sys/security/mac_test/mac_test.c#4 integrate .. //depot/projects/netperf+sockets/sys/sys/_null.h#2 integrate .. //depot/projects/netperf+sockets/sys/sys/mac.h#3 integrate .. //depot/projects/netperf+sockets/sys/sys/mac_policy.h#3 integrate .. //depot/projects/netperf+sockets/sys/sys/mbuf.h#3 integrate .. //depot/projects/netperf+sockets/sys/sys/param.h#3 integrate Differences ... ==== //depot/projects/netperf+sockets/sys/compat/ndis/cfg_var.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/cfg_var.h,v 1.1 2003/12/11 22:34:37 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/cfg_var.h,v 1.2 2003/12/18 03:51:21 wpaul Exp $ */ #ifndef _CFG_VAR_H_ @@ -39,6 +39,7 @@ char *nc_cfgkey; char *nc_cfgdesc; char nc_val[256]; + int nc_idx; }; typedef struct ndis_cfg ndis_cfg; ==== //depot/projects/netperf+sockets/sys/compat/ndis/kern_ndis.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.3 2003/12/12 08:54:48 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.6 2003/12/18 03:51:21 wpaul Exp $"); #include #include @@ -76,6 +76,7 @@ void *, uint32_t); __stdcall static void ndis_statusdone_func(ndis_handle); __stdcall static void ndis_setdone_func(ndis_handle, ndis_status); +__stdcall static void ndis_getdone_func(ndis_handle, ndis_status); __stdcall static void ndis_resetdone_func(ndis_handle, ndis_status, uint8_t); /* @@ -122,6 +123,15 @@ } __stdcall static void +ndis_getdone_func(adapter, status) + ndis_handle adapter; + ndis_status status; +{ + printf ("Query done... %x\n", status); + return; +} + +__stdcall static void ndis_resetdone_func(adapter, status, addressingreset) ndis_handle adapter; ndis_status status; @@ -204,6 +214,10 @@ while(1) { if (vals->nc_cfgkey == NULL) break; + if (vals->nc_idx != sc->ndis_devidx) { + vals++; + continue; + } SYSCTL_ADD_STRING(&sc->ndis_ctx, SYSCTL_CHILDREN(sc->ndis_tree), OID_AUTO, vals->nc_cfgkey, @@ -309,11 +323,21 @@ { struct ndis_softc *sc; ndis_handle adapter; + ndis_packet *p; __stdcall ndis_return_handler returnfunc; if (arg == NULL || packet == NULL) return; + p = packet; + + /* Decrement refcount. */ + p->np_private.npp_count--; + + /* Release packet when refcount hits zero, otherwise return. */ + if (p->np_private.npp_count) + return; + sc = arg; returnfunc = sc->ndis_chars.nmc_return_packet_func; adapter = sc->ndis_block.nmb_miniportadapterctx; @@ -439,6 +463,7 @@ priv = &p->np_private; buf = priv->npp_head; + priv->npp_count = 0; for (buf = priv->npp_head; buf != NULL; buf = buf->nb_next) { if (buf == priv->npp_head) @@ -450,25 +475,15 @@ *m0 = NULL; return(ENOBUFS); } - - /* - * Note: there's some hackery going on here. We want - * to mate the mbufs to the buffers in the NDIS packet, - * but we don't mark the mbufs with the M_EXT flag to - * indicate external storage. This is because we don't - * want anything special done to free the buffers. - * Depending on the circumstances, the caller may want - * the entire packet to be released, buffers and all, - * by calling ndis_return_packet(), or ndis_free_packet(). - * We leave it up to the caller to do the MEXTADD() to - * set up the free mechanism in the first mbuf of the - * chain. - */ if (buf->nb_bytecount > buf->nb_size) m->m_len = buf->nb_size; else m->m_len = buf->nb_bytecount; m->m_data = buf->nb_mappedsystemva; + MEXTADD(m, m->m_data, m->m_len, ndis_return_packet, + p->np_rsvd[0], 0, EXT_NDIS); + m->m_ext.ext_buf = (void *)p; /* XXX */ + priv->npp_count++; totlen += m->m_len; if (m->m_flags & MT_HEADER) *m0 = m; @@ -524,7 +539,6 @@ for (m = m0; m != NULL; m = m->m_next) { if (m->m_len == NULL) continue; - buf = malloc(sizeof(ndis_buffer), M_DEVBUF, M_NOWAIT|M_ZERO); if (buf == NULL) { ndis_free_packet(*p); @@ -651,20 +665,11 @@ if (sc->ndis_tmaps == NULL) return(ENOMEM); - sc->ndis_mbufs = malloc(sizeof(struct mbuf) * sc->ndis_maxpkts, - M_DEVBUF, M_NOWAIT|M_ZERO); - - if (sc->ndis_mbufs == NULL) { - free(sc->ndis_tmaps, M_DEVBUF); - return(ENOMEM); - } - for (i = 0; i < sc->ndis_maxpkts; i++) { error = bus_dmamap_create(sc->ndis_ttag, 0, &sc->ndis_tmaps[i]); if (error) { free(sc->ndis_tmaps, M_DEVBUF); - free(sc->ndis_mbufs, M_DEVBUF); return(ENODEV); } } @@ -677,18 +682,24 @@ void *arg; { struct ndis_softc *sc; + struct mbuf *m; + ndis_packet *p = NULL; int i; sc = arg; for (i = 0; i < sc->ndis_maxpkts; i++) { - if (sc->ndis_mbufs[i] != NULL) - m_freem(sc->ndis_mbufs[i]); + if (sc->ndis_txarray[i] != NULL) { + p = sc->ndis_txarray[i]; + m = (struct mbuf *)p->np_rsvd[1]; + if (m != NULL) + m_freem(m); + ndis_free_packet(sc->ndis_txarray[i]); + } bus_dmamap_destroy(sc->ndis_ttag, sc->ndis_tmaps[i]); } free(sc->ndis_tmaps, M_DEVBUF); - free(sc->ndis_mbufs, M_DEVBUF); bus_dma_tag_destroy(sc->ndis_ttag); @@ -1041,6 +1052,7 @@ block->nmb_signature = (void *)0xcafebabe; block->nmb_setdone_func = ndis_setdone_func; + block->nmb_querydone_func = ndis_getdone_func; block->nmb_status_func = ndis_status_func; block->nmb_statusdone_func = ndis_statusdone_func; block->nmb_resetdone_func = ndis_resetdone_func; ==== //depot/projects/netperf+sockets/sys/compat/ndis/ndis_var.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.1 2003/12/11 22:34:37 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ndis_var.h,v 1.2 2003/12/14 21:31:32 wpaul Exp $ */ #ifndef _NDIS_VAR_H_ @@ -814,14 +814,16 @@ struct ndis_packet { ndis_packet_private np_private; union { + /* For connectionless miniports. */ struct { uint8_t np_miniport_rsvd[2 * sizeof(void *)]; uint8_t np_wrapper_rsvd[2 * sizeof(void *)]; - } np_rsvd; + } np_clrsvd; + /* For de-serialized miniports */ struct { uint8_t np_miniport_rsvdex[3 * sizeof(void *)]; uint8_t np_wrapper_rsvdex[sizeof(void *)]; - } np_rsvdrx; + } np_dsrsvd; struct { uint8_t np_mac_rsvd[4 * sizeof(void *)]; } np_macrsvd; @@ -840,6 +842,9 @@ typedef struct ndis_packet ndis_packet; +/* mbuf ext type for NDIS */ +#define EXT_NDIS 0x999 + struct ndis_filterdbs { union { void *nf_ethdb; ==== //depot/projects/netperf+sockets/sys/compat/ndis/ntoskrnl_var.h#2 (text+ko) ==== @@ -29,12 +29,18 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.1 2003/12/11 22:34:37 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.3 2003/12/13 09:07:35 wpaul Exp $ */ #ifndef _NTOSKRNL_VAR_H_ #define _NTOSKRNL_VAR_H_ +/* Note: assumes x86 page size of 4K. */ +#define PAGE_SHIFT 12 +#define SPAN_PAGES(ptr, len) \ + ((uint32_t)((((uintptr_t)(ptr) & (PAGE_SIZE -1)) + \ + (len) + (PAGE_SIZE - 1)) >> PAGE_SHIFT)) + typedef uint32_t kspin_lock; struct slist_entry { @@ -54,6 +60,13 @@ typedef union slist_header slist_header; +struct list_entry { + struct list_entry *nle_flink; + struct list_entry *nle_blink; +}; + +typedef struct list_entry list_entry; + struct general_lookaside { slist_header gl_listhead; uint16_t gl_depth; @@ -73,6 +86,7 @@ uint32_t gl_size; void *gl_allocfunc; void *gl_freefunc; + list_entry gl_listent; uint32_t gl_lasttotallocs; union { uint32_t gl_lastallocmisses; ==== //depot/projects/netperf+sockets/sys/compat/ndis/subr_ndis.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.2 2003/12/12 08:54:48 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.7 2003/12/16 18:56:33 wpaul Exp $"); /* * This file implements a translation layer between the BSD networking @@ -61,6 +61,7 @@ #include #include #include +#include #include #include @@ -83,6 +84,7 @@ #include #include +#include #include #include #include @@ -104,10 +106,18 @@ __stdcall static ndis_status ndis_setattr_ex(ndis_handle, ndis_handle, uint32_t, uint32_t, ndis_interface_type); __stdcall static void ndis_open_cfg(ndis_status *, ndis_handle *, ndis_handle); +__stdcall static void ndis_open_cfgbyidx(ndis_status *, ndis_handle, + uint32_t, ndis_unicode_string *, ndis_handle *); +__stdcall static void ndis_open_cfgbyname(ndis_status *, ndis_handle, + ndis_unicode_string *, ndis_handle *); static ndis_status ndis_encode_parm(ndis_miniport_block *, struct sysctl_oid *, ndis_parm_type, ndis_config_parm **); +static ndis_status ndis_decode_parm(ndis_miniport_block *, + ndis_config_parm *, char *); __stdcall static void ndis_read_cfg(ndis_status *, ndis_config_parm **, ndis_handle, ndis_unicode_string *, ndis_parm_type); +__stdcall static void ndis_write_cfg(ndis_status *, ndis_handle, + ndis_unicode_string *, ndis_config_parm *); __stdcall static void ndis_close_cfg(ndis_handle); __stdcall static void ndis_create_lock(ndis_spin_lock *); __stdcall static void ndis_destroy_lock(ndis_spin_lock *); @@ -182,6 +192,8 @@ __stdcall static uint8_t ndis_wait_event(ndis_event *, uint32_t); __stdcall static ndis_status ndis_unicode2ansi(ndis_ansi_string *, ndis_unicode_string *); +__stdcall static ndis_status ndis_ansi2unicode(ndis_unicode_string *, + ndis_ansi_string *); __stdcall static ndis_status ndis_assign_pcirsrc(ndis_handle, uint32_t, ndis_resource_list **); __stdcall static ndis_status ndis_register_intr(ndis_miniport_interrupt *, @@ -192,6 +204,7 @@ ndis_shutdown_handler); __stdcall static void ndis_deregister_shutdown(ndis_handle); __stdcall static uint32_t ndis_numpages(ndis_buffer *); +__stdcall static void ndis_buf_physpages(ndis_buffer *, uint32_t *); __stdcall static void ndis_query_bufoffset(ndis_buffer *, uint32_t *, uint32_t *); __stdcall static void ndis_sleep(uint32_t); @@ -207,6 +220,14 @@ ndis_list_entry *, ndis_spin_lock *); __stdcall static uint8_t ndis_sync_with_intr(ndis_miniport_interrupt *, void *, void *); +__stdcall static void ndis_time(uint64_t *); +__stdcall static void ndis_init_string(ndis_unicode_string **, char *); +__stdcall static void ndis_init_ansi_string(ndis_ansi_string *, char *); +__stdcall static void ndis_free_string(ndis_unicode_string *); +__stdcall static ndis_status ndis_remove_miniport(ndis_handle *); +__stdcall static void ndis_termwrap(ndis_handle, void *); +__stdcall static void ndis_get_devprop(ndis_handle, void *, void *, + void *, cm_resource_list *, cm_resource_list *); __stdcall static void dummy(void); @@ -306,6 +327,14 @@ return; } +__stdcall static void +ndis_termwrap(handle, syspec) + ndis_handle handle; + void *syspec; +{ + return; +} + __stdcall static ndis_status ndis_register_miniport(handle, characteristics, len) ndis_handle handle; @@ -398,6 +427,30 @@ return; } +__stdcall static void +ndis_open_cfgbyname(status, cfg, subkey, subhandle) + ndis_status *status; + ndis_handle cfg; + ndis_unicode_string *subkey; + ndis_handle *subhandle; +{ + *subhandle = cfg; + *status = NDIS_STATUS_SUCCESS; + return; +} + +__stdcall static void +ndis_open_cfgbyidx(status, cfg, idx, subkey, subhandle) + ndis_status *status; + ndis_handle cfg; + uint32_t idx; + ndis_unicode_string *subkey; + ndis_handle *subhandle; +{ + *status = NDIS_STATUS_FAILURE; + return; +} + static ndis_status ndis_encode_parm(block, oid, type, parm) ndis_miniport_block *block; @@ -502,7 +555,83 @@ return; } +static ndis_status +ndis_decode_parm(block, parm, val) + ndis_miniport_block *block; + ndis_config_parm *parm; + char *val; +{ + uint16_t *unicode; + ndis_unicode_string *ustr; + + unicode = (uint16_t *)&block->nmb_dummybuf; + + switch(parm->ncp_type) { + case ndis_parm_string: + ustr = &parm->ncp_parmdata.ncp_stringdata; + ndis_unicode_to_ascii(ustr->nus_buf, ustr->nus_len, &val); + break; + case ndis_parm_int: + sprintf(val, "%ul", parm->ncp_parmdata.ncp_intdata); + break; + case ndis_parm_hexint: + sprintf(val, "%xu", parm->ncp_parmdata.ncp_intdata); + break; + default: + return(NDIS_STATUS_FAILURE); + break; + } + return(NDIS_STATUS_SUCCESS); +} + __stdcall static void +ndis_write_cfg(status, cfg, key, parm) + ndis_status *status; + ndis_handle cfg; + ndis_unicode_string *key; + ndis_config_parm *parm; +{ + char *keystr = NULL; + ndis_miniport_block *block; + struct ndis_softc *sc; + struct sysctl_oid *oidp; + struct sysctl_ctx_entry *e; + char val[256]; + + block = (ndis_miniport_block *)cfg; + sc = (struct ndis_softc *)block->nmb_ifp; + + ndis_unicode_to_ascii(key->nus_buf, key->nus_len, &keystr); + + /* Decode the parameter into a string. */ + *status = ndis_decode_parm(block, parm, val); + if (*status != NDIS_STATUS_SUCCESS) { + free(keystr, M_DEVBUF); + return; + } + + /* See if the key already exists. */ + + TAILQ_FOREACH(e, &sc->ndis_ctx, link) { + oidp = e->entry; + if (strcmp(oidp->oid_name, keystr) == 0) { + /* Found it, set the value. */ + strcpy((char *)oidp->oid_arg1, val); + free(keystr, M_DEVBUF); + return; + } + } + + /* Not found, add a new key with the specified value. */ + ndis_add_sysctl(sc, keystr, "(dynamically set key)", + val, CTLFLAG_RW); + + free(keystr, M_DEVBUF); + *status = NDIS_STATUS_SUCCESS; + return; +} + +__stdcall static void ndis_close_cfg(cfg) ndis_handle cfg; { @@ -1583,12 +1712,37 @@ __stdcall static ndis_status ndis_unicode2ansi(dstr, sstr) - ndis_ansi_string *dstr; - ndis_unicode_string *sstr; + ndis_ansi_string *dstr; + ndis_unicode_string *sstr; +{ + if (dstr == NULL || sstr == NULL) + return(NDIS_STATUS_FAILURE); + if (ndis_unicode_to_ascii(sstr->nus_buf, + sstr->nus_len, &dstr->nas_buf)) + return(NDIS_STATUS_FAILURE); + dstr->nas_len = dstr->nas_maxlen = strlen(dstr->nas_buf); + return (NDIS_STATUS_SUCCESS); +} + +__stdcall static ndis_status +ndis_ansi2unicode(dstr, sstr) + ndis_unicode_string *dstr; + ndis_ansi_string *sstr; { - ndis_unicode_to_ascii(sstr->nus_buf, sstr->nus_len, &dstr->nas_buf); - dstr->nas_len = strlen(dstr->nas_buf); - printf ("unicode 2 ansi...\n"); + char *str; + if (dstr == NULL || sstr == NULL) + return(NDIS_STATUS_FAILURE); + str = malloc(sstr->nas_len + 1, M_DEVBUF, M_NOWAIT); + if (str == NULL) + return(NDIS_STATUS_FAILURE); + strncpy(str, sstr->nas_buf, sstr->nas_len); + *(str + sstr->nas_len) = '\0'; + if (ndis_ascii_to_unicode(str, &dstr->nus_buf)) { + free(str, M_DEVBUF); + return(NDIS_STATUS_FAILURE); + } + dstr->nus_len = dstr->nus_maxlen = sstr->nas_len * 2; + free(str, M_DEVBUF); return (NDIS_STATUS_SUCCESS); } @@ -1679,7 +1833,18 @@ ndis_numpages(buf) ndis_buffer *buf; { - return(howmany(buf->nb_bytecount, PAGE_SIZE)); + if (buf->nb_bytecount == 0) + return(1); + return(SPAN_PAGES(buf->nb_mappedsystemva, buf->nb_bytecount)); +} + +__stdcall static void +ndis_buf_physpages(buf, pages) + ndis_buffer *buf; + uint32_t *pages; +{ + *pages = ndis_numpages(buf); + return; } __stdcall static void @@ -1839,7 +2004,93 @@ return(sync(syncctx)); } +/* + * Return the number of 100 nanosecond intervals since + * January 1, 1601. (?!?!) + */ +__stdcall static void +ndis_time(tval) + uint64_t *tval; +{ + struct timespec ts; + nanotime(&ts); + *tval = (ts.tv_nsec / 100) + (ts.tv_nsec * 10000000); + *tval += 11644473600; + return; +} + +__stdcall static void +ndis_init_string(dst, src) + ndis_unicode_string **dst; + char *src; +{ + ndis_unicode_string *u; + + u = malloc(sizeof(ndis_unicode_string), M_DEVBUF, M_NOWAIT); + if (u == NULL) + return; + u->nus_buf = NULL; + if (ndis_ascii_to_unicode(src, &u->nus_buf)) { + free(u, M_DEVBUF); + return; + } + u->nus_len = u->nus_maxlen = strlen(src) * 2; + return; +} + __stdcall static void +ndis_free_string(str) + ndis_unicode_string *str; +{ + if (str == NULL) + return; + if (str->nus_buf != NULL) + free(str->nus_buf, M_DEVBUF); + free(str, M_DEVBUF); + return; +} + +__stdcall static ndis_status +ndis_remove_miniport(adapter) + ndis_handle *adapter; +{ + return(NDIS_STATUS_SUCCESS); +} + +__stdcall static void +ndis_init_ansi_string(dst, src) + ndis_ansi_string *dst; + char *src; +{ + ndis_ansi_string *a; + + a = dst; + if (a == NULL) + return; + if (src == NULL) { + a->nas_len = a->nas_maxlen = 0; + a->nas_buf = NULL; + } else { + a->nas_buf = src; + a->nas_len = a->nas_maxlen = strlen(src); + } + + return; +} + +__stdcall static void ndis_get_devprop(adapter, phydevobj, + funcdevobj, nextdevobj, resources, transresources) + ndis_handle adapter; + void *phydevobj; + void *funcdevobj; + void *nextdevobj; + cm_resource_list *resources; + cm_resource_list *transresources; +{ + return; +} + +__stdcall static void dummy() { printf ("NDIS dummy called...\n"); @@ -1847,6 +2098,18 @@ } image_patch_table ndis_functbl[] = { + { "NdisGetBufferPhysicalArraySize", (FUNC)ndis_buf_physpages }, + { "NdisMGetDeviceProperty", (FUNC)ndis_get_devprop }, + { "NdisInitAnsiString", (FUNC)ndis_init_ansi_string }, + { "NdisWriteConfiguration", (FUNC)ndis_write_cfg }, + { "NdisAnsiStringToUnicodeString", (FUNC)ndis_ansi2unicode }, + { "NdisTerminateWrapper", (FUNC)ndis_termwrap }, + { "NdisOpenConfigurationKeyByName", (FUNC)ndis_open_cfgbyname }, + { "NdisOpenConfigurationKeyByIndex", (FUNC)ndis_open_cfgbyidx }, + { "NdisMRemoveMiniport", (FUNC)ndis_remove_miniport }, + { "NdisInitializeString", (FUNC)ndis_init_string }, + { "NdisFreeString", (FUNC)ndis_free_string }, + { "NdisGetCurrentSystemTime", (FUNC)ndis_time }, { "NdisMSynchronizeWithInterrupt", (FUNC)ndis_sync_with_intr }, { "NdisMAllocateSharedMemoryAsync", (FUNC)ndis_alloc_sharedmem_async }, { "NdisInterlockedInsertHeadList", (FUNC)ndis_insert_head }, ==== //depot/projects/netperf+sockets/sys/compat/ndis/subr_ntoskrnl.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.1 2003/12/11 22:34:37 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.3 2003/12/13 07:41:12 wpaul Exp $"); #include #include @@ -95,8 +95,13 @@ lookaside_alloc_func *, lookaside_free_func *, uint32_t, size_t, uint32_t, uint16_t); __stdcall static void ntoskrnl_delete_nplookaside(npaged_lookaside_list *); -static slist_entry *ntoskrnl_push_slist(slist_entry *, slist_entry *); -static slist_entry *ntoskrnl_pop_slist(slist_entry *); +__stdcall static slist_entry *ntoskrnl_push_slist(/*slist_entry *, + slist_entry * */ void); +__stdcall static slist_entry *ntoskrnl_pop_slist(/*slist_entry * */ void); +__stdcall static slist_entry *ntoskrnl_push_slist_ex(/*slist_entry *, + slist_entry *,*/ kspin_lock *); +__stdcall static slist_entry *ntoskrnl_pop_slist_ex(/*slist_entry *, + kspin_lock * */void); __stdcall static void dummy(void); static struct mtx ntoskrnl_interlock; @@ -352,6 +357,8 @@ uint32_t tag; uint16_t depth; { + struct mtx *mtx; + lookaside->nll_l.gl_size = size; lookaside->nll_l.gl_tag = tag; if (allocfunc == NULL) @@ -364,6 +371,13 @@ else lookaside->nll_l.gl_freefunc = freefunc; + mtx = malloc(sizeof(struct mtx), M_DEVBUF, M_NOWAIT|M_ZERO); + if (mtx == NULL) + return; + mtx_init(mtx, "ndisnplook", "ndis lookaside lock", + MTX_DEF | MTX_RECURSE | MTX_DUPOK); + lookaside->nll_obsoletelock = (kspin_lock)mtx; + return; } @@ -371,6 +385,8 @@ ntoskrnl_delete_lookaside(lookaside) paged_lookaside_list *lookaside; { + mtx_destroy((struct mtx *)lookaside->nll_obsoletelock); + free((struct mtx *)lookaside->nll_obsoletelock, M_DEVBUF); return; } @@ -385,6 +401,8 @@ uint32_t tag; uint16_t depth; { + struct mtx *mtx; + lookaside->nll_l.gl_size = size; lookaside->nll_l.gl_tag = tag; if (allocfunc == NULL) @@ -397,6 +415,13 @@ else lookaside->nll_l.gl_freefunc = freefunc; + mtx = malloc(sizeof(struct mtx), M_DEVBUF, M_NOWAIT|M_ZERO); + if (mtx == NULL) + return; + mtx_init(mtx, "ndisnplook", "ndis lookaside lock", + MTX_DEF | MTX_RECURSE | MTX_DUPOK); + lookaside->nll_obsoletelock = (kspin_lock)mtx; + return; } @@ -404,41 +429,90 @@ ntoskrnl_delete_nplookaside(lookaside) npaged_lookaside_list *lookaside; { + mtx_destroy((struct mtx *)lookaside->nll_obsoletelock); + free((struct mtx *)lookaside->nll_obsoletelock, M_DEVBUF); return; } /* * Note: the interlocked slist push and pop routines are - * declared to be _fastcall in Windows, which means they - * use the _cdecl calling convention here. + * declared to be _fastcall in Windows. gcc 3.4 is supposed + * to have support for this calling convention, however we + * don't have that version available yet, so we kludge things + * up using some inline assembly. */ -static slist_entry * -ntoskrnl_push_slist(head, entry) - slist_entry *head; + +__stdcall static slist_entry * +ntoskrnl_push_slist(/*head, entry*/ void) +{ + slist_header *head; slist_entry *entry; -{ slist_entry *oldhead; + + __asm__("movl %%ecx, %%ecx" : "=c" (head)); + __asm__("movl %%edx, %%edx" : "=d" (entry)); + mtx_lock(&ntoskrnl_interlock); - oldhead = head->sl_next; - entry->sl_next = head->sl_next; - head->sl_next = entry; + oldhead = head->slh_list.slh_next; + entry->sl_next = head->slh_list.slh_next; + head->slh_list.slh_next = entry; mtx_unlock(&ntoskrnl_interlock); return(oldhead); } -static slist_entry * -ntoskrnl_pop_slist(head) - slist_entry *head; +__stdcall static slist_entry * +ntoskrnl_pop_slist(/*head*/ void) { + slist_header *head; slist_entry *first; + + __asm__("movl %%ecx, %%ecx" : "=c" (head)); + mtx_lock(&ntoskrnl_interlock); - first = head->sl_next; + first = head->slh_list.slh_next; if (first != NULL) - head->sl_next = first->sl_next; + head->slh_list.slh_next = first->sl_next; mtx_unlock(&ntoskrnl_interlock); return(first); } +__stdcall static slist_entry * +ntoskrnl_push_slist_ex(/*head, entry,*/ lock) + kspin_lock *lock; +{ + slist_header *head; + slist_entry *entry; + slist_entry *oldhead; + + __asm__("movl %%ecx, %%ecx" : "=c" (head)); + __asm__("movl %%edx, %%edx" : "=d" (entry)); + + mtx_lock((struct mtx *)*lock); + oldhead = head->slh_list.slh_next; + entry->sl_next = head->slh_list.slh_next; + head->slh_list.slh_next = entry; + mtx_unlock((struct mtx *)*lock); + return(oldhead); +} + +__stdcall static slist_entry * +ntoskrnl_pop_slist_ex(/*head, lock*/ void) +{ + slist_header *head; + kspin_lock *lock; + slist_entry *first; + + __asm__("movl %%ecx, %%ecx" : "=c" (head)); + __asm__("movl %%edx, %%edx" : "=d" (lock)); + + mtx_lock((struct mtx *)*lock); + first = head->slh_list.slh_next; + if (first != NULL) + head->slh_list.slh_next = first->sl_next; + mtx_unlock((struct mtx *)*lock); + return(first); +} + __stdcall static void dummy() { @@ -455,6 +529,9 @@ { "strcmp", (FUNC)strcmp }, { "strncpy", (FUNC)strncpy }, { "strcpy", (FUNC)strcpy }, + { "strlen", (FUNC)strlen }, + { "memcpy", (FUNC)memcpy }, + { "memset", (FUNC)memset }, { "IofCallDriver", (FUNC)ntoskrnl_iofcalldriver }, { "IoBuildSynchronousFsdRequest", (FUNC)ntoskrnl_iobuildsynchfsdreq }, { "KeWaitForSingleObject", (FUNC)ntoskrnl_waitforobj }, @@ -481,6 +558,8 @@ { "ExDeleteNPagedLookasideList", (FUNC)ntoskrnl_delete_nplookaside }, { "InterlockedPopEntrySList", (FUNC)ntoskrnl_pop_slist }, { "InterlockedPushEntrySList", (FUNC)ntoskrnl_push_slist }, + { "ExInterlockedPopEntrySList", (FUNC)ntoskrnl_pop_slist_ex }, + { "ExInterlockedPushEntrySList",(FUNC)ntoskrnl_push_slist_ex }, /* * This last entry is a catch-all for any function we haven't ==== //depot/projects/netperf+sockets/sys/conf/files#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.858 2003/12/07 04:41:11 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.859 2003/12/15 21:49:41 bms Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1570,7 +1570,6 @@ # crypto support >>> TRUNCATED FOR MAIL (1000 lines) <<<