From owner-p4-projects@FreeBSD.ORG Sun Jul 10 00:06:54 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2EA7616A420; Sun, 10 Jul 2005 00:06:54 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 008BE16A41C for ; Sun, 10 Jul 2005 00:06:53 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A1F3943D53 for ; Sun, 10 Jul 2005 00:06:53 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6A06ruL002242 for ; Sun, 10 Jul 2005 00:06:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6A06r1m002239 for perforce@freebsd.org; Sun, 10 Jul 2005 00:06:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 10 Jul 2005 00:06:53 GMT Message-Id: <200507100006.j6A06r1m002239@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 79873 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 00:06:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=79873 Change 79873 by rwatson@rwatson_zoo on 2005/07/10 00:06:42 Remove unnecessary include addition, probably stemming from a build fix required relative to some base system nit in the past. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_proc.c#11 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_proc.c#11 (text+ko) ==== @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #include From owner-p4-projects@FreeBSD.ORG Sun Jul 10 00:07:56 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA06A16A420; Sun, 10 Jul 2005 00:07:55 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B511516A41C for ; Sun, 10 Jul 2005 00:07:55 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 605C543D53 for ; Sun, 10 Jul 2005 00:07:55 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6A07txu002267 for ; Sun, 10 Jul 2005 00:07:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6A07t8L002264 for perforce@freebsd.org; Sun, 10 Jul 2005 00:07:55 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 10 Jul 2005 00:07:55 GMT Message-Id: <200507100007.j6A07t8L002264@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 79874 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 00:07:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=79874 Change 79874 by rwatson@rwatson_zoo on 2005/07/10 00:07:08 'out' label only used for MAC error handling, so #ifdef MAC. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/sys_generic.c#14 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/sys_generic.c#14 (text+ko) ==== @@ -625,7 +625,9 @@ if (error == 0 && (com & IOC_OUT)) error = copyout(data, uap->data, (u_int)size); +#ifdef MAC out: +#endif if (memp != NULL) free(memp, M_IOCTLOPS); fdrop(fp, td); From owner-p4-projects@FreeBSD.ORG Sun Jul 10 00:08:57 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A95D16A420; Sun, 10 Jul 2005 00:08:57 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 556F516A41C for ; Sun, 10 Jul 2005 00:08:57 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 22ECD43D48 for ; Sun, 10 Jul 2005 00:08:57 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6A08vfJ002406 for ; Sun, 10 Jul 2005 00:08:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6A08udl002403 for perforce@freebsd.org; Sun, 10 Jul 2005 00:08:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 10 Jul 2005 00:08:56 GMT Message-Id: <200507100008.j6A08udl002403@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 79875 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 00:08:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=79875 Change 79875 by rwatson@rwatson_zoo on 2005/07/10 00:08:33 Remove now unneeded capability.h includes. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/amd64/amd64/mem.c#8 edit .. //depot/projects/trustedbsd/sebsd/sys/netatalk/ddp_usrreq.c#11 edit .. //depot/projects/trustedbsd/sebsd/sys/netinet6/ip6_input.c#13 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/amd64/amd64/mem.c#8 (text+ko) ==== @@ -57,7 +57,6 @@ #include #include #include -#include #include #include ==== //depot/projects/trustedbsd/sebsd/sys/netatalk/ddp_usrreq.c#11 (text+ko) ==== @@ -34,7 +34,6 @@ #include #include #include -#include #include #include ==== //depot/projects/trustedbsd/sebsd/sys/netinet6/ip6_input.c#13 (text+ko) ==== @@ -79,7 +79,6 @@ #include #include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Sun Jul 10 00:09:59 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AEAD16A420; Sun, 10 Jul 2005 00:09:59 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3F25A16A41C for ; Sun, 10 Jul 2005 00:09:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F303243D45 for ; Sun, 10 Jul 2005 00:09:58 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6A09wHG002428 for ; Sun, 10 Jul 2005 00:09:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6A09wWr002425 for perforce@freebsd.org; Sun, 10 Jul 2005 00:09:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 10 Jul 2005 00:09:58 GMT Message-Id: <200507100009.j6A09wWr002425@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 79876 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 00:10:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=79876 Change 79876 by rwatson@rwatson_zoo on 2005/07/10 00:09:25 Style cleanup, restoration, fixage. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_ntptime.c#7 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_prot.c#14 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_xxx.c#10 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/subr_witness.c#15 edit .. //depot/projects/trustedbsd/sebsd/sys/net/if.c#14 edit .. //depot/projects/trustedbsd/sebsd/sys/net/if_ppp.c#11 edit .. //depot/projects/trustedbsd/sebsd/sys/net/if_tun.c#13 edit .. //depot/projects/trustedbsd/sebsd/sys/net/ppp_tty.c#8 edit .. //depot/projects/trustedbsd/sebsd/sys/netinet/ip_output.c#13 edit .. //depot/projects/trustedbsd/sebsd/sys/security/mac_test/mac_test.c#17 edit .. //depot/projects/trustedbsd/sebsd/sys/ufs/ufs/ufs_vnops.c#12 edit .. //depot/projects/trustedbsd/sebsd/sys/vm/vm_mmap.c#13 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_ntptime.c#7 (text+ko) ==== @@ -334,7 +334,7 @@ mtx_lock(&Giant); modes = ntv.modes; if (modes) - error = cap_check(td,CAP_SYS_TIME); + error = cap_check(td, CAP_SYS_TIME); if (error) goto done2; s = splclock(); @@ -955,7 +955,7 @@ struct timeval atv; int error; - if ((error = cap_check(td,CAP_SYS_TIME))) + if ((error = cap_check(td, CAP_SYS_TIME))) return (error); mtx_lock(&Giant); ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_prot.c#14 (text+ko) ==== @@ -1346,6 +1346,7 @@ suser(struct thread *td) { #ifdef INVARIANTS + if (td != curthread) { printf("suser: thread %p (%d %s) != curthread %p (%d %s)\n", td, td->td_proc->p_pid, td->td_proc->p_comm, ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_xxx.c#10 (text+ko) ==== @@ -139,7 +139,7 @@ { int error; - error = cap_check(td,CAP_SYS_ADMIN); + error = cap_check(td, CAP_SYS_ADMIN); if (error) return (error); mtx_lock(&Giant); @@ -297,7 +297,7 @@ int error, domainnamelen; mtx_lock(&Giant); - if ((error = cap_check (td,CAP_SYS_ADMIN))) + if ((error = cap_check(td, CAP_SYS_ADMIN))) goto done2; if ((u_int)uap->len > sizeof (domainname) - 1) { error = EINVAL; ==== //depot/projects/trustedbsd/sebsd/sys/kern/subr_witness.c#15 (text+ko) ==== @@ -454,7 +454,6 @@ /* * We have to release Giant before initializing its witness * structure so that WITNESS doesn't get confused. - */ mtx_unlock(&Giant); mtx_assert(&Giant, MA_NOTOWNED); ==== //depot/projects/trustedbsd/sebsd/sys/net/if.c#14 (text+ko) ==== @@ -1311,7 +1311,7 @@ break; case SIOCSIFPHYS: - error = cap_check (td, CAP_NET_ADMIN); + error = cap_check(td, CAP_NET_ADMIN); if (error) return (error); if (ifp->if_ioctl == NULL) ==== //depot/projects/trustedbsd/sebsd/sys/net/if_ppp.c#11 (text+ko) ==== @@ -476,7 +476,7 @@ break; case PPPIOCSFLAGS: - if ((error = cap_check (td, CAP_NET_ADMIN)) != 0) + if ((error = cap_check(td, CAP_NET_ADMIN)) != 0) break; flags = *(int *)data & SC_MASK; s = splsoftnet(); @@ -720,7 +720,7 @@ break; case SIOCSIFMTU: - if ((error = cap_check (td, CAP_NET_ADMIN)) != 0) + if ((error = cap_check(td, CAP_NET_ADMIN)) != 0) break; if (ifr->ifr_mtu > PPP_MAXMTU) error = EINVAL; ==== //depot/projects/trustedbsd/sebsd/sys/net/if_tun.c#13 (text+ko) ==== @@ -577,7 +577,7 @@ if (tunp->mtu < IF_MINMTU) return (EINVAL); if (tp->tun_if.if_mtu != tunp->mtu - && (error = cap_check (td, CAP_NET_ADMIN)) != 0) + && (error = cap_check(td, CAP_NET_ADMIN)) != 0) return (error); tp->tun_if.if_mtu = tunp->mtu; tp->tun_if.if_type = tunp->type; ==== //depot/projects/trustedbsd/sebsd/sys/net/ppp_tty.c#8 (text+ko) ==== @@ -180,7 +180,7 @@ register struct ppp_softc *sc; int error, s; - if ((error = cap_check (td, CAP_NET_ADMIN)) != 0) + if ((error = cap_check(td, CAP_NET_ADMIN)) != 0) return (error); s = spltty(); @@ -449,7 +449,7 @@ break; case PPPIOCSRASYNCMAP: - if ((error = cap_check (td, CAP_NET_ADMIN)) != 0) + if ((error = cap_check(td, CAP_NET_ADMIN)) != 0) break; sc->sc_rasyncmap = *(u_int *)data; break; ==== //depot/projects/trustedbsd/sebsd/sys/netinet/ip_output.c#13 (text+ko) ==== @@ -1299,7 +1299,7 @@ if ((error = soopt_mcopyin(sopt, m)) != 0) /* XXX */ break; priv = (sopt->sopt_td != NULL && - cap_check (sopt->sopt_td, CAP_NET_ADMIN) != 0) ? 0 : 1; + cap_check(sopt->sopt_td, CAP_NET_ADMIN) != 0) ? 0 : 1; req = mtod(m, caddr_t); len = m->m_len; optname = sopt->sopt_name; ==== //depot/projects/trustedbsd/sebsd/sys/security/mac_test/mac_test.c#17 (text+ko) ==== @@ -1384,8 +1384,9 @@ static int mac_test_check_cap(struct ucred *cred, cap_value_t capv) { - ASSERT_CRED_LABEL(cred->cr_label); - return 0; + + ASSERT_CRED_LABEL(cred->cr_label); + return (0); } static int ==== //depot/projects/trustedbsd/sebsd/sys/ufs/ufs/ufs_vnops.c#12 (text+ko) ==== @@ -617,7 +617,7 @@ * jail(8). */ if (vp->v_type != VDIR && (mode & S_ISTXT)) { - if (cap_check_cred (cred, CAP_SYS_RAWIO, SUSER_ALLOWJAIL)) + if (cap_check_cred(cred, CAP_SYS_RAWIO, SUSER_ALLOWJAIL)) return (EFTYPE); } if (!groupmember(ip->i_gid, cred) && (mode & ISGID)) { @@ -630,7 +630,7 @@ * Setting suid on nonowned files requires CAP_FSETID. */ if ((ip->i_uid != cred->cr_uid) && (mode & ISUID)) { - if (cap_check_cred (cred, CAP_FSETID, SUSER_ALLOWJAIL)) + if (cap_check_cred(cred, CAP_FSETID, SUSER_ALLOWJAIL)) return (EPERM); } ==== //depot/projects/trustedbsd/sebsd/sys/vm/vm_mmap.c#13 (text+ko) ==== @@ -643,7 +643,7 @@ * "immortal." */ if (uap->behav == MADV_PROTECT) { - error = cap_check (td, CAP_SYS_RESOURCE); + error = cap_check(td, CAP_SYS_RESOURCE); if (error == 0) { p = td->td_proc; PROC_LOCK(p); From owner-p4-projects@FreeBSD.ORG Sun Jul 10 00:30:26 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43A4E16A420; Sun, 10 Jul 2005 00:30:26 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C287D16A41C for ; Sun, 10 Jul 2005 00:30:25 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5625E43D45 for ; Sun, 10 Jul 2005 00:30:25 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6A0UPVx003442 for ; Sun, 10 Jul 2005 00:30:25 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6A0UNYK003431 for perforce@freebsd.org; Sun, 10 Jul 2005 00:30:23 GMT (envelope-from scottl@freebsd.org) Date: Sun, 10 Jul 2005 00:30:23 GMT Message-Id: <200507100030.j6A0UNYK003431@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 79878 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 00:30:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=79878 Change 79878 by scottl@scottl-junior on 2005/07/10 00:25:33 Start off the soc_ufsj branch with an integration. Affected files ... .. //depot/projects/soc2005/ufsj/src/COPYRIGHT#1 branch .. //depot/projects/soc2005/ufsj/src/LOCKS#1 branch .. //depot/projects/soc2005/ufsj/src/MAINTAINERS#1 branch .. //depot/projects/soc2005/ufsj/src/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/Makefile.inc1#1 branch .. //depot/projects/soc2005/ufsj/src/README#1 branch .. //depot/projects/soc2005/ufsj/src/UPDATING#1 branch .. //depot/projects/soc2005/ufsj/src/bin/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/Makefile.inc#1 branch .. //depot/projects/soc2005/ufsj/src/bin/cat/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/cat/cat.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/cat/cat.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/chflags/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/chflags/chflags.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/chflags/chflags.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/chio/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/chio/chio.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/chio/chio.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/chio/defs.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/chio/pathnames.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/chmod/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/chmod/chmod.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/chmod/chmod.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/cp/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/cp/cp.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/cp/cp.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/cp/extern.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/cp/utils.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/csh/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/soc2005/ufsj/src/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/soc2005/ufsj/src/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/soc2005/ufsj/src/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/soc2005/ufsj/src/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/soc2005/ufsj/src/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/soc2005/ufsj/src/bin/csh/config.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/csh/config_p.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/csh/host.defs#1 branch .. //depot/projects/soc2005/ufsj/src/bin/date/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/date/date.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/date/date.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/date/extern.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/date/netdate.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/date/vary.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/date/vary.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/dd/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/dd/args.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/dd/conv.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/dd/conv_tab.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/dd/dd.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/dd/dd.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/dd/dd.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/dd/extern.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/dd/gen.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/dd/misc.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/dd/position.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/dd/ref.ascii#1 branch .. //depot/projects/soc2005/ufsj/src/bin/dd/ref.ebcdic#1 branch .. //depot/projects/soc2005/ufsj/src/bin/dd/ref.ibm#1 branch .. //depot/projects/soc2005/ufsj/src/bin/dd/ref.lcase#1 branch .. //depot/projects/soc2005/ufsj/src/bin/dd/ref.oldascii#1 branch .. //depot/projects/soc2005/ufsj/src/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/soc2005/ufsj/src/bin/dd/ref.oldibm#1 branch .. //depot/projects/soc2005/ufsj/src/bin/dd/ref.pareven#1 branch .. //depot/projects/soc2005/ufsj/src/bin/dd/ref.parnone#1 branch .. //depot/projects/soc2005/ufsj/src/bin/dd/ref.parodd#1 branch .. //depot/projects/soc2005/ufsj/src/bin/dd/ref.parset#1 branch .. //depot/projects/soc2005/ufsj/src/bin/dd/ref.swab#1 branch .. //depot/projects/soc2005/ufsj/src/bin/dd/ref.ucase#1 branch .. //depot/projects/soc2005/ufsj/src/bin/df/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/df/df.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/df/df.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/domainname/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/domainname/domainname.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/domainname/domainname.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/echo/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/echo/echo.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/echo/echo.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/POSIX#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/README#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/buf.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/cbc.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/ed.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/ed.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/glbl.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/io.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/main.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/re.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/sub.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/=.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/README#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/TODO#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/a.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/a.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/a.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/a1.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/a2.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/addr.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/addr.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/addr.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/addr1.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/addr2.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/ascii.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/bang1.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/bang1.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/bang1.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/bang1.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/bang2.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/c.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/c.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/c.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/c1.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/c2.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/d.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/d.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/d.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/d.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/e1.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/e1.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/e1.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/e1.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/e2.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/e2.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/e2.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/e2.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/e3.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/e3.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/e3.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/e3.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/e4.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/e4.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/e4.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/f1.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/f2.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/g1.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/g1.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/g1.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/g1.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/g2.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/g2.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/g2.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/g2.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/g3.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/g3.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/g3.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/g3.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/g4.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/g4.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/g4.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/g5.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/g5.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/g5.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/h.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/i.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/i.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/i.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/i1.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/i2.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/i3.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/j.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/j.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/j.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/k.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/k.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/k.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/k1.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/k2.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/k3.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/k4.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/l.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/l.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/l.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/m.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/m.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/m.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/m.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/n.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/n.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/n.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/nl.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/nl1.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/nl1.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/nl1.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/nl2.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/nl2.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/nl2.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/p.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/p.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/p.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/q.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/q.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/q.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/q1.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/r1.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/r1.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/r1.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/r1.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/r2.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/r2.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/r2.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/r2.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/r3.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/r3.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/r3.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/s1.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/s1.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/s1.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/s1.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/s10.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/s2.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/s2.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/s2.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/s2.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/s3.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/s3.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/s3.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/s3.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/s4.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/s5.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/s6.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/s7.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/s8.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/s9.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/t.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/t.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/t1.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/t1.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/t1.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/t1.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/t2.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/t2.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/t2.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/t2.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/u.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/u.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/u.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/u.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/v.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/v.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/v.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/w.d#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/w.r#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/w.t#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/w1.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/w2.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/w3.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/x.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/test/z.err#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ed/undo.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/expr/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/expr/expr.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/expr/expr.y#1 branch .. //depot/projects/soc2005/ufsj/src/bin/getfacl/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/getfacl/getfacl.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/getfacl/getfacl.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/hostname/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/hostname/hostname.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/hostname/hostname.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/kenv/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/kenv/kenv.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/kenv/kenv.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/kill/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/kill/kill.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/kill/kill.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ln/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ln/ln.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ln/ln.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ln/symlink.7#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ls/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ls/cmp.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ls/extern.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ls/ls.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ls/ls.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ls/ls.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ls/print.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ls/util.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/mkdir/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/mkdir/mkdir.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/mkdir/mkdir.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/mv/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/mv/mv.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/mv/mv.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/ar_io.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/ar_subs.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/buf_subs.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/cache.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/cache.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/cpio.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/cpio.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/cpio.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/extern.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/file_subs.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/ftree.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/ftree.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/gen_subs.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/getoldopt.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/options.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/options.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/pat_rep.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/pat_rep.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/pax.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/pax.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/pax.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/sel_subs.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/sel_subs.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/tables.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/tables.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/tar.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/tar.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/tar.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pax/tty_subs.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ps/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ps/extern.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ps/fmt.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ps/keyword.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ps/nlist.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ps/print.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ps/ps.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ps/ps.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/ps/ps.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pwd/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pwd/pwd.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/pwd/pwd.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/rcp/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/rcp/extern.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/rcp/rcp.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/rcp/rcp.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/rcp/util.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/realpath/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/realpath/realpath.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/realpath/realpath.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/rm/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/rm/rm.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/rm/rm.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/rmail/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/rmdir/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/rmdir/rmdir.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/rmdir/rmdir.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/setfacl/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/setfacl/file.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/setfacl/mask.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/setfacl/merge.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/setfacl/remove.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/setfacl/setfacl.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/setfacl/setfacl.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/setfacl/setfacl.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/setfacl/util.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/TOUR#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/alias.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/alias.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/arith.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/arith.y#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/arith_lex.l#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/bltin/echo.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/bltin/echo.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/builtins.def#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/cd.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/cd.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/error.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/error.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/eval.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/eval.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/exec.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/exec.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/expand.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/expand.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/funcs/cmv#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/funcs/dirs#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/funcs/kill#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/funcs/login#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/funcs/newgrp#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/funcs/popd#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/funcs/pushd#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/funcs/suspend#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/histedit.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/init.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/input.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/input.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/jobs.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/jobs.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/mail.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/mail.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/main.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/main.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/memalloc.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/memalloc.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/miscbltin.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/mkbuiltins#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/mkinit.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/mknodes.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/mksyntax.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/mktokens#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/myhistedit.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/mystring.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/mystring.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/nodes.c.pat#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/nodetypes#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/options.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/options.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/output.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/output.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/parser.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/parser.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/redir.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/redir.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/sh.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/shell.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/show.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/show.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/trap.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/trap.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/var.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sh/var.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sleep/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sleep/sleep.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sleep/sleep.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/stty/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/stty/cchar.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/stty/extern.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/stty/gfmt.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/stty/key.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/stty/modes.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/stty/print.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/stty/stty.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/stty/stty.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/stty/stty.h#1 branch .. //depot/projects/soc2005/ufsj/src/bin/stty/util.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sync/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sync/sync.8#1 branch .. //depot/projects/soc2005/ufsj/src/bin/sync/sync.c#1 branch .. //depot/projects/soc2005/ufsj/src/bin/test/Makefile#1 branch .. //depot/projects/soc2005/ufsj/src/bin/test/TEST.README#1 branch .. //depot/projects/soc2005/ufsj/src/bin/test/TEST.csh#1 branch .. //depot/projects/soc2005/ufsj/src/bin/test/TEST.sh#1 branch .. //depot/projects/soc2005/ufsj/src/bin/test/test.1#1 branch .. //depot/projects/soc2005/ufsj/src/bin/test/test.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/AUTHORS#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/BUGS#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/COPYING#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/ChangeLog#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/INSTALL#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/NEWS#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/README#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/README.ldap#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/README.y2k#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/amd.8#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/amd.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/amd.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/autil.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/clock.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/conf.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/map.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/opts.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/restart.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/sched.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amq/amq.8#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amq/amq.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amq/amq.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/bootstrap#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/doc/version.texi#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/libamu/util.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/m4/amindent#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/m4/autopat#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/m4/mkconf#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/tasks#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/AUTHORS#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/ChangeLog#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/FAQ#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/INSTALL#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Makefile.am#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Makefile.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/NEWS#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/README#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Test/array.b#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Test/atan.b#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Test/div.b#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Test/exp.b#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Test/fact.b#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Test/jn.b#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Test/ln.b#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Test/mul.b#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Test/raise.b#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Test/signum#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Test/sine.b#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/Test/timetest#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/acconfig.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/aclocal.m4#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/bc/bc.y#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/bc/const.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/bc/execute.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/bc/global.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/bc/global.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/bc/load.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/bc/main.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/bc/proto.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/bc/scan.l#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/bc/storage.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/bc/util.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/config.h.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/configure#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/configure.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/dc/array.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/dc/dc.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/dc/dc.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/dc/eval.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/dc/misc.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/dc/stack.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/dc/string.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/doc/bc.1#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/doc/dc.1#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/h/number.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/install-sh#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/lib/number.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/missing#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bc/stamp-h.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/CHANGES#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/FAQ#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/Makefile.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/README#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/acconfig.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dnssec/dnssec-signkey.8#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dnssec/dnssec-signkey.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dnssec/dnssec-signkey.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/aclconf.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/include/named/aclconf.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/config.guess#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/config.sub#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/configure.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/arm/isc.color.gif#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/arm/validate.sh.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2163.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2168.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2181.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2230.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2308.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2317.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2373.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2374.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2375.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2418.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2535.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2536.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2537.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2538.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2539.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2540.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2541.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2553.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2671.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2672.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2673.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2782.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2825.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2826.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2845.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2874.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2915.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2929.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2930.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc2931.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc3007.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc3008.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc3071.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc3090.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc3110.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc3123.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc3152.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc3197.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc3225.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc3226.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc3258.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc3363.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc3364.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc3425.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc3445.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc3467.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc3490.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc3491.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc3492.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc3493.txt#1 branch .. //depot/projects/soc2005/ufsj/src/contrib/bind9/doc/rfc/rfc3513.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jul 10 01:44:58 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E69416A420; Sun, 10 Jul 2005 01:44:57 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2336E16A41C for ; Sun, 10 Jul 2005 01:44:57 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC37943D46 for ; Sun, 10 Jul 2005 01:44:56 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6A1iuXY012900 for ; Sun, 10 Jul 2005 01:44:56 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6A1iubi012897 for perforce@freebsd.org; Sun, 10 Jul 2005 01:44:56 GMT (envelope-from wsalamon@computer.org) Date: Sun, 10 Jul 2005 01:44:56 GMT Message-Id: <200507100144.j6A1iubi012897@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 79880 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 01:44:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=79880 Change 79880 by wsalamon@rickenbacker on 2005/07/10 01:44:36 Pass the parameter 'fd' to the AUDIT macro instead of the user space parameter, now that audit call is made out of the common kern_fstatfs routine. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#8 (text+ko) ==== @@ -320,7 +320,7 @@ struct statfs *sp, sb; int error; - AUDIT_ARG(fd, uap->fd); + AUDIT_ARG(fd, fd); error = getvnode(td->td_proc->p_fd, fd, &fp); if (error) return (error); From owner-p4-projects@FreeBSD.ORG Sun Jul 10 01:49:05 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 50A2216A420; Sun, 10 Jul 2005 01:49:03 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 93A2616A41C for ; Sun, 10 Jul 2005 01:49:02 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C1EF43D53 for ; Sun, 10 Jul 2005 01:49:02 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6A1n22V013058 for ; Sun, 10 Jul 2005 01:49:02 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6A1n10e013055 for perforce@freebsd.org; Sun, 10 Jul 2005 01:49:01 GMT (envelope-from wsalamon@computer.org) Date: Sun, 10 Jul 2005 01:49:01 GMT Message-Id: <200507100149.j6A1n10e013055@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 79881 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 01:49:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=79881 Change 79881 by wsalamon@rickenbacker on 2005/07/10 01:48:27 Temporarily comment out the conditional around the include of segments.h in order to compile an AUDIT conf. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/i386/include/pcb.h#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/i386/include/pcb.h#4 (text+ko) ==== @@ -39,9 +39,9 @@ /* * Intel 386 process control block */ -#ifndef _KERNEL +//#ifndef _KERNEL #include -#endif +//#endif #include struct pcb { From owner-p4-projects@FreeBSD.ORG Sun Jul 10 01:52:07 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E8C816A420; Sun, 10 Jul 2005 01:52:07 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C0D0B16A41C for ; Sun, 10 Jul 2005 01:52:06 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8107C43D45 for ; Sun, 10 Jul 2005 01:52:06 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6A1q66R013201 for ; Sun, 10 Jul 2005 01:52:06 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6A1q6vK013198 for perforce@freebsd.org; Sun, 10 Jul 2005 01:52:06 GMT (envelope-from scottl@freebsd.org) Date: Sun, 10 Jul 2005 01:52:06 GMT Message-Id: <200507100152.j6A1q6vK013198@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 79882 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 01:52:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=79882 Change 79882 by scottl@scottl-junior on 2005/07/10 01:51:40 IFC Affected files ... .. //depot/projects/soc2005/ufsj/src/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/ral/if_ral.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/dev/usb/if_ural.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/net80211/ieee80211_crypto.c#2 integrate Differences ... ==== //depot/projects/soc2005/ufsj/src/sys/dev/iwi/if_iwi.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.7 2005/07/08 16:31:18 sam Exp $ */ +/* $FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.8 2005/07/10 00:17:04 sam Exp $ */ /*- * Copyright (c) 2004, 2005 @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.7 2005/07/08 16:31:18 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.8 2005/07/10 00:17:04 sam Exp $"); /*- * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver @@ -116,8 +116,6 @@ int); static void iwi_reset_rx_ring(struct iwi_softc *, struct iwi_rx_ring *); static void iwi_free_rx_ring(struct iwi_softc *, struct iwi_rx_ring *); -static int iwi_key_alloc(struct ieee80211com *, - const struct ieee80211_key *); static int iwi_media_change(struct ifnet *); static void iwi_media_status(struct ifnet *, struct ifmediareq *); static int iwi_newstate(struct ieee80211com *, enum ieee80211_state, int); @@ -365,7 +363,6 @@ /* override state transition machine */ sc->sc_newstate = ic->ic_newstate; ic->ic_newstate = iwi_newstate; - ic->ic_crypto.cs_key_alloc = iwi_key_alloc; ieee80211_media_init(ic, iwi_media_change, iwi_media_status); bpfattach2(ifp, DLT_IEEE802_11_RADIO, @@ -799,15 +796,6 @@ } static int -iwi_key_alloc(struct ieee80211com *ic, const struct ieee80211_key *k) -{ - if (k >= ic->ic_nw_keys && k < &ic->ic_nw_keys[IEEE80211_WEP_NKID]) - return k - ic->ic_nw_keys; - - return IEEE80211_KEYIX_NONE; -} - -static int iwi_media_change(struct ifnet *ifp) { struct iwi_softc *sc = ifp->if_softc; ==== //depot/projects/soc2005/ufsj/src/sys/dev/ral/if_ral.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ral/if_ral.c,v 1.8 2005/07/08 19:33:42 damien Exp $ */ +/* $FreeBSD: src/sys/dev/ral/if_ral.c,v 1.9 2005/07/10 00:17:04 sam Exp $ */ /*- * Copyright (c) 2005 @@ -18,7 +18,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ral/if_ral.c,v 1.8 2005/07/08 19:33:42 damien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ral/if_ral.c,v 1.9 2005/07/10 00:17:04 sam Exp $"); /*- * Ralink Technology RT2500 chipset driver @@ -91,8 +91,6 @@ struct ral_rx_ring *); static struct ieee80211_node *ral_node_alloc( struct ieee80211_node_table *); -static int ral_key_alloc(struct ieee80211com *, - const struct ieee80211_key *); static int ral_media_change(struct ifnet *); static void ral_next_scan(void *); static void ral_iter_func(void *, struct ieee80211_node *); @@ -463,7 +461,6 @@ /* override state transition machine */ sc->sc_newstate = ic->ic_newstate; ic->ic_newstate = ral_newstate; - ic->ic_crypto.cs_key_alloc = ral_key_alloc; ieee80211_media_init(ic, ral_media_change, ieee80211_media_status); bpfattach2(ifp, DLT_IEEE802_11_RADIO, @@ -910,15 +907,6 @@ } static int -ral_key_alloc(struct ieee80211com *ic, const struct ieee80211_key *k) -{ - if (k >= ic->ic_nw_keys && k < &ic->ic_nw_keys[IEEE80211_WEP_NKID]) - return k - ic->ic_nw_keys; - - return IEEE80211_KEYIX_NONE; -} - -static int ral_media_change(struct ifnet *ifp) { struct ral_softc *sc = ifp->if_softc; ==== //depot/projects/soc2005/ufsj/src/sys/dev/usb/if_ural.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.9 2005/07/08 19:19:06 damien Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.10 2005/07/10 00:17:05 sam Exp $ */ /*- * Copyright (c) 2005 @@ -18,7 +18,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.9 2005/07/08 19:19:06 damien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.10 2005/07/10 00:17:05 sam Exp $"); /*- * Ralink Technology RT2500USB chipset driver @@ -109,8 +109,6 @@ Static void ural_free_tx_list(struct ural_softc *); Static int ural_alloc_rx_list(struct ural_softc *); Static void ural_free_rx_list(struct ural_softc *); -Static int ural_key_alloc(struct ieee80211com *, - const struct ieee80211_key *); Static int ural_media_change(struct ifnet *); Static void ural_next_scan(void *); Static void ural_task(void *); @@ -493,7 +491,6 @@ /* override state transition machine */ sc->sc_newstate = ic->ic_newstate; ic->ic_newstate = ural_newstate; - ic->ic_crypto.cs_key_alloc = ural_key_alloc; ieee80211_media_init(ic, ural_media_change, ieee80211_media_status); bpfattach2(ifp, DLT_IEEE802_11_RADIO, @@ -667,15 +664,6 @@ } Static int -ural_key_alloc(struct ieee80211com *ic, const struct ieee80211_key *k) -{ - if (k >= ic->ic_nw_keys && k < &ic->ic_nw_keys[IEEE80211_WEP_NKID]) - return k - ic->ic_nw_keys; - - return IEEE80211_KEYIX_NONE; -} - -Static int ural_media_change(struct ifnet *ifp) { struct ural_softc *sc = ifp->if_softc; ==== //depot/projects/soc2005/ufsj/src/sys/net80211/ieee80211_crypto.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_crypto.c,v 1.9 2005/06/10 16:11:24 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_crypto.c,v 1.10 2005/07/09 23:15:30 sam Exp $"); /* * IEEE 802.11 generic crypto support. @@ -61,7 +61,24 @@ static int null_key_alloc(struct ieee80211com *ic, const struct ieee80211_key *k) { - return IEEE80211_KEYIX_NONE; + if (!(&ic->ic_nw_keys[0] <= k && + k < &ic->ic_nw_keys[IEEE80211_WEP_NKID])) { + /* + * Not in the global key table, the driver should handle this + * by allocating a slot in the h/w key table/cache. In + * lieu of that return key slot 0 for any unicast key + * request. We disallow the request if this is a group key. + * This default policy does the right thing for legacy hardware + * with a 4 key table. It also handles devices that pass + * packets through untouched when marked with the WEP bit + * and key index 0. + */ + if ((k->wk_flags & IEEE80211_KEY_GROUP) == 0) + return 0; /* NB: use key index 0 for ucast key */ + else + return IEEE80211_KEYIX_NONE; + } + return k - ic->ic_nw_keys; } static int null_key_delete(struct ieee80211com *ic, const struct ieee80211_key *k) From owner-p4-projects@FreeBSD.ORG Sun Jul 10 02:08:28 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D85D716A420; Sun, 10 Jul 2005 02:08:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 97AF916A41C for ; Sun, 10 Jul 2005 02:08:27 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2890143D45 for ; Sun, 10 Jul 2005 02:08:27 +0000 (GMT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6A28Rb0014052 for ; Sun, 10 Jul 2005 02:08:27 GMT (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6A28QXa014049 for perforce@freebsd.org; Sun, 10 Jul 2005 02:08:26 GMT (envelope-from scottl@freebsd.org) Date: Sun, 10 Jul 2005 02:08:26 GMT Message-Id: <200507100208.j6A28QXa014049@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Cc: Subject: PERFORCE change 79884 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 02:08:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=79884 Change 79884 by scottl@scottl-junior on 2005/07/10 02:08:18 Integrate the ufsj work to the SoC2005 area so that it can be worked on. Affected files ... .. //depot/projects/soc2005/ufsj/src/sbin/mount/mount.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sbin/tunefs/tunefs.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/conf/files#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/conf/options#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/modules/ufs/Makefile#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/sys/mount.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/ufs/ffs/fs.h#2 integrate .. //depot/projects/soc2005/ufsj/src/sys/ufs/ufs/journal.h#1 branch .. //depot/projects/soc2005/ufsj/src/sys/ufs/ufs/ufs_journal.c#1 branch .. //depot/projects/soc2005/ufsj/src/sys/ufs/ufs/ufsmount.h#2 integrate Differences ... ==== //depot/projects/soc2005/ufsj/src/sbin/mount/mount.c#2 (text+ko) ==== @@ -106,6 +106,7 @@ { MNT_SOFTDEP, "soft-updates" }, { MNT_MULTILABEL, "multilabel" }, { MNT_ACLS, "acls" }, + { MNT_JOURNAL, "journalling" }, { 0, NULL } }; ==== //depot/projects/soc2005/ufsj/src/sbin/tunefs/tunefs.c#2 (text+ko) ==== @@ -83,6 +83,8 @@ int Aflag, aflag, eflag, evalue, fflag, fvalue, Lflag, lflag; int mflag, mvalue, nflag, oflag, ovalue, pflag, sflag, svalue; int ch, found_arg, i; + ino_t jvalue; + int jflag; const char *chg[2]; struct ufs_args args; struct statfs stfs; @@ -93,9 +95,10 @@ nflag = oflag = pflag = sflag = 0; avalue = Lvalue = lvalue = nvalue = NULL; evalue = fvalue = mvalue = ovalue = svalue = 0; + jvalue = jflag = 0; active = 0; found_arg = 0; /* At least one arg is required. */ - while ((ch = getopt(argc, argv, "Aa:e:f:L:l:m:n:o:ps:")) != -1) + while ((ch = getopt(argc, argv, "Aa:e:f:j:L:l:m:n:o:ps:")) != -1) switch (ch) { case 'A': @@ -135,6 +138,14 @@ fflag = 1; break; + case 'j': + found_arg = 1; + name = "journalling"; + jvalue = strtoul(optarg, NULL, 0); + if ((jvalue == 1) || (jvalue == 2)) + errx(10, "Inode value cannot be 1 or 2"); + jflag = 1; + break; case 'L': found_arg = 1; name = "volume label"; @@ -282,6 +293,15 @@ sblock.fs_avgfilesize = fvalue; } } + if (jflag) { + name = "journalling"; + if (jvalue == 0) + sblock.fs_flags &= ~FS_JOURNAL; + else { + sblock.fs_flags |= FS_JOURNAL; + sblock.fs_journal_inode = jvalue; + } + } if (lflag) { name = "multilabel"; if (strcmp(lvalue, "enable") == 0) { ==== //depot/projects/soc2005/ufsj/src/sys/conf/files#2 (text+ko) ==== @@ -1793,6 +1793,7 @@ ufs/ufs/ufs_extattr.c optional ffs ufs/ufs/ufs_inode.c optional ffs ufs/ufs/ufs_lookup.c optional ffs +ufs/ufs/ufs_journal.c optional ffs ufs/ufs/ufs_quota.c optional ffs ufs/ufs/ufs_vfsops.c optional ffs ufs/ufs/ufs_vnops.c optional ffs ==== //depot/projects/soc2005/ufsj/src/sys/conf/options#2 (text+ko) ==== @@ -223,6 +223,9 @@ # Enable fast hash lookups for large directories on UFS-based filesystems. UFS_DIRHASH opt_ufs.h +# Enable code to do filesystem journalling. +UFS_JOURNAL opt_ufs.h + # The below sentence is not in English, and neither is this one. # We plan to remove the static dependences above, with a # _ROOT option to control if it usable as root. This list ==== //depot/projects/soc2005/ufsj/src/sys/modules/ufs/Makefile#2 (text+ko) ==== @@ -6,10 +6,10 @@ SRCS= opt_ddb.h opt_directio.h opt_ffs.h opt_ffs_broken_fixme.h opt_mac.h \ opt_quota.h opt_suiddir.h opt_ufs.h \ vnode_if.h ufs_acl.c ufs_bmap.c ufs_dirhash.c ufs_extattr.c \ - ufs_inode.c ufs_lookup.c ufs_quota.c ufs_vfsops.c \ + ufs_inode.c ufs_journal.c ufs_lookup.c ufs_quota.c ufs_vfsops.c \ ufs_vnops.c ffs_alloc.c ffs_balloc.c ffs_inode.c ffs_snapshot.c \ ffs_softdep.c ffs_subr.c ffs_tables.c ffs_vfsops.c ffs_vnops.c -CFLAGS+= -DSOFTUPDATES -DUFS_DIRHASH +CFLAGS+= -DSOFTUPDATES -DUFS_DIRHASH -DUFS_JOURNAL .include ==== //depot/projects/soc2005/ufsj/src/sys/sys/mount.h#2 (text+ko) ==== @@ -188,6 +188,7 @@ #define MNT_SUIDDIR 0x00100000 /* special handling of SUID on dirs */ #define MNT_SOFTDEP 0x00200000 /* soft updates being done */ #define MNT_NOSYMFOLLOW 0x00400000 /* do not follow symlinks */ +#define MNT_JOURNAL 0x00800000 /* journalling being done */ #define MNT_JAILDEVFS 0x02000000 /* jail-friendly DEVFS behaviour */ #define MNT_MULTILABEL 0x04000000 /* MAC support for individual objects */ #define MNT_ACLS 0x08000000 /* ACL support enabled */ ==== //depot/projects/soc2005/ufsj/src/sys/ufs/ffs/ffs_alloc.c#2 (text+ko) ==== @@ -63,6 +63,7 @@ __FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_alloc.c,v 1.132 2005/02/20 08:02:15 delphij Exp $"); #include "opt_quota.h" +#include "opt_ufs.h" #include #include @@ -2321,6 +2322,11 @@ static SYSCTL_NODE(_vfs_ffs, FFS_SET_FLAGS, setflags, CTLFLAG_WR, sysctl_ffs_fsck, "Change Filesystem Flags"); +#ifdef UFS_JOURNAL +static SYSCTL_NODE(_vfs_ffs, FFS_SET_JINODE, setjinode, CTLFLAG_WR, + sysctl_ffs_fsck, "Set Journal Inode"); +#endif + #ifdef DEBUG static int fsckcmds = 0; SYSCTL_INT(_debug, OID_AUTO, fsckcmds, CTLFLAG_RW, &fsckcmds, 0, ""); @@ -2365,6 +2371,13 @@ switch (oidp->oid_number) { +#ifdef UFS_JOURNAL + case FFS_SET_JINODE: + fs->fs_journal_inode = (ino_t)cmd.value; + fs->fs_flags |= FS_JOURNAL; + break; +#endif + case FFS_SET_FLAGS: #ifdef DEBUG if (fsckcmds) ==== //depot/projects/soc2005/ufsj/src/sys/ufs/ffs/ffs_vfsops.c#2 (text+ko) ==== @@ -57,6 +57,7 @@ #include #include #include +#include #include #include @@ -265,6 +266,14 @@ vn_finished_write(mp); return (error); } +#ifdef UFS_JOURNAL + /* check and start the journal */ + if ((fs->fs_flags & FS_JOURNAL) && + (error = ufsj_start(devvp, mp, fs, td))) { + vn_finished_write(mp); + return (error); + } +#endif /* check to see if we need to start softdep */ if ((fs->fs_flags & FS_DOSOFTDEP) && (error = softdep_mount(devvp, mp, fs, td->td_ucred))){ @@ -751,6 +760,14 @@ } if (ronly == 0) { +#ifdef UFS_JOURNAL + /* check and start the journal */ + if ((fs->fs_flags & FS_JOURNAL) && + (error = ufsj_start(devvp, mp, fs, td))) { + vn_finished_write(mp); + return (error); + } +#endif if ((fs->fs_flags & FS_DOSOFTDEP) && (error = softdep_mount(devvp, mp, fs, cred)) != 0) { free(fs->fs_csp, M_UFSMNT); @@ -930,6 +947,12 @@ if ((error = ffs_flushfiles(mp, flags, td)) != 0) return (error); } +#ifdef UFS_JOURNAL + if (mp->mnt_flag & MNT_JOURNAL) { + if ((error = ufsj_stop(mp, flags, td)) != 0) + return (error); + } +#endif fs = ump->um_fs; UFS_LOCK(ump); if (fs->fs_pendingblocks != 0 || fs->fs_pendinginodes != 0) { ==== //depot/projects/soc2005/ufsj/src/sys/ufs/ffs/fs.h#2 (text+ko) ==== @@ -33,6 +33,10 @@ #ifndef _UFS_FFS_FS_H_ #define _UFS_FFS_FS_H_ +#ifdef _KERNEL +#include "opt_ufs.h" +#endif + /* * Each disk drive contains some number of filesystems. * A filesystem consists of a number of cylinder groups. @@ -212,6 +216,7 @@ #define FFS_ADJ_NFFREE 10 /* adjust number of free frags */ #define FFS_ADJ_NUMCLUSTERS 11 /* adjust number of free clusters */ #define FFS_MAXID 12 /* number of valid ffs ids */ +#define FFS_SET_JINODE 13 /* set the journally inode number */ /* * Command structure passed in to the filesystem to adjust filesystem values. @@ -347,8 +352,13 @@ int32_t fs_state; /* validate fs_clean field */ int32_t fs_old_postblformat; /* format of positional layout tables */ int32_t fs_old_nrpos; /* number of rotational positions */ +#ifdef UFS_JOURNAL + ino_t fs_journal_inode; /* Inode of the journal file */ + int32_t fs_spare5; /* old fs_rotbloff */ +#else int32_t fs_spare5[2]; /* old fs_postbloff */ /* old fs_rotbloff */ +#endif int32_t fs_magic; /* magic number */ }; @@ -406,6 +416,7 @@ #define FS_INDEXDIRS 0x08 /* kernel supports indexed directories */ #define FS_ACLS 0x10 /* file system has ACLs enabled */ #define FS_MULTILABEL 0x20 /* file system is MAC multi-label */ +#define FS_JOURNAL 0x40 /* file system has a journal */ #define FS_FLAGS_UPDATED 0x80 /* flags have been moved to new location */ /* ==== //depot/projects/soc2005/ufsj/src/sys/ufs/ufs/ufsmount.h#2 (text+ko) ==== @@ -77,6 +77,7 @@ time_t um_itime[MAXQUOTAS]; /* inode quota time limit */ char um_qflags[MAXQUOTAS]; /* quota specific flags */ int64_t um_savedmaxfilesize; /* XXX - limit maxfilesize */ + struct ufs_journal *um_journal; /* Journal data */ int (*um_balloc)(struct vnode *, off_t, int, struct ucred *, int, struct buf **); int (*um_blkatoff)(struct vnode *, off_t, char **, struct buf **); int (*um_truncate)(struct vnode *, off_t, int, struct ucred *, struct thread *); From owner-p4-projects@FreeBSD.ORG Sun Jul 10 02:19:42 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B451016A420; Sun, 10 Jul 2005 02:19:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5E63716A41C for ; Sun, 10 Jul 2005 02:19:41 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 32BA243D46 for ; Sun, 10 Jul 2005 02:19:41 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6A2Jf09015443 for ; Sun, 10 Jul 2005 02:19:41 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6A2Je3Z015440 for perforce@freebsd.org; Sun, 10 Jul 2005 02:19:40 GMT (envelope-from wsalamon@computer.org) Date: Sun, 10 Jul 2005 02:19:40 GMT Message-Id: <200507100219.j6A2Je3Z015440@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 79885 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 02:19:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=79885 Change 79885 by wsalamon@rickenbacker on 2005/07/10 02:18:48 Remove the credential argument from VOP_FSYNC() as it is no longer part of the call interface. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#24 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#24 (text+ko) ==== @@ -502,7 +502,7 @@ if (audit_in_failure && audit_q_len == 0 && audit_pre_q_len == 0) { VOP_LOCK(vp, LK_DRAIN | LK_INTERLOCK, td); - (void)VOP_FSYNC(vp, cred, MNT_WAIT, td); + (void)VOP_FSYNC(vp, MNT_WAIT, td); VOP_UNLOCK(vp, 0, td); panic("Audit store overflow; record queue drained."); } From owner-p4-projects@FreeBSD.ORG Sun Jul 10 04:39:33 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7170616A421; Sun, 10 Jul 2005 04:39:32 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4739516A41F for ; Sun, 10 Jul 2005 04:39:32 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F095D43D46 for ; Sun, 10 Jul 2005 04:39:31 +0000 (GMT) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6A4dVi0021249 for ; Sun, 10 Jul 2005 04:39:31 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6A4dVTM021246 for perforce@freebsd.org; Sun, 10 Jul 2005 04:39:31 GMT (envelope-from csjp@freebsd.org) Date: Sun, 10 Jul 2005 04:39:31 GMT Message-Id: <200507100439.j6A4dVTM021246@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 79890 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 04:39:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=79890 Change 79890 by csjp@csjp_xor on 2005/07/10 04:38:31 Activate mac_syscall_enter and mac_syscall_exit for all other supported architectures. It should be noted that syscall value (or code) is greater than p->p_sysent->sv_size, we change code to zero. This might have an impact on kernel tracing mechanisms, however at least we will be tracing the accurate syscall now. (nosys). Anyone who could test these to make sure everything builds alright, that would be great! I do not have access to half this hardware. Affected files ... .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/trap.c#26 edit .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/trap.c#16 edit .. //depot/projects/trustedbsd/mac/sys/arm/arm/trap.c#6 edit .. //depot/projects/trustedbsd/mac/sys/ia64/ia32/ia32_trap.c#4 edit .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/trap.c#29 edit .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/trap.c#19 edit .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/trap.c#29 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/alpha/alpha/trap.c#26 (text+ko) ==== @@ -32,6 +32,7 @@ /* #include "opt_fix_unaligned_vax_fp.h" */ #include "opt_ddb.h" #include "opt_ktrace.h" +#include "opt_mac.h" #include #include @@ -42,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -687,10 +689,9 @@ if (p->p_sysent->sv_mask) code &= p->p_sysent->sv_mask; - if (code >= p->p_sysent->sv_size) - callp = &p->p_sysent->sv_table[0]; - else - callp = &p->p_sysent->sv_table[code]; + if (code >= p->p_sysent->sv_size) + code = 0; + callp = &p->p_sysent->sv_table[code]; nargs = (callp->sy_narg & SYF_ARGMASK) + hidden; switch (nargs) { @@ -734,7 +735,14 @@ PTRACESTOP_SC(p, td, S_PT_SCE); +#ifdef MAC + error = mac_syscall_enter(td, args + hidden, code); + if (error == 0) + error = (*callp->sy_call)(td, args + hidden); + mac_syscall_exit(td, args + hidden, code, error); +#else error = (*callp->sy_call)(td, args + hidden); +#endif } ==== //depot/projects/trustedbsd/mac/sys/amd64/amd64/trap.c#16 (text+ko) ==== @@ -48,6 +48,7 @@ #include "opt_cpu.h" #include "opt_isa.h" #include "opt_ktrace.h" +#include "opt_mac.h" #include #include @@ -59,6 +60,7 @@ #include #include #include +#include #include #include #include @@ -740,10 +742,9 @@ if (p->p_sysent->sv_mask) code &= p->p_sysent->sv_mask; - if (code >= p->p_sysent->sv_size) - callp = &p->p_sysent->sv_table[0]; - else - callp = &p->p_sysent->sv_table[code]; + if (code >= p->p_sysent->sv_size) + code = 0; + callp = &p->p_sysent->sv_table[code]; narg = callp->sy_narg & SYF_ARGMASK; @@ -779,12 +780,18 @@ PTRACESTOP_SC(p, td, S_PT_SCE); - if ((callp->sy_narg & SYF_MPSAFE) == 0) { + if ((callp->sy_narg & SYF_MPSAFE) == 0) mtx_lock(&Giant); +#ifdef MAC + error = mac_syscall_enter(td, argp, code); + if (error == 0) error = (*callp->sy_call)(td, argp); + mac_syscall_exit(td, argp, code, error); +#else + error = (*callp->sy_call)(td, argp); +#endif + if ((callp->sy_narg & SYF_MPSAFE) == 0) mtx_unlock(&Giant); - } else - error = (*callp->sy_call)(td, argp); } switch (error) { ==== //depot/projects/trustedbsd/mac/sys/arm/arm/trap.c#6 (text+ko) ==== @@ -80,6 +80,7 @@ #include "opt_ktrace.h" +#include "opt_mac.h" #include __FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.15 2005/05/25 13:46:32 cognet Exp $"); @@ -91,6 +92,7 @@ #include #include #include +#include #include #include #include @@ -894,9 +896,8 @@ if (p->p_sysent->sv_mask) code &= p->p_sysent->sv_mask; if (code >= p->p_sysent->sv_size) - callp = &p->p_sysent->sv_table[0]; - else - callp = &p->p_sysent->sv_table[code]; + code = 0; + callp = &p->p_sysent->sv_table[code]; nargs = callp->sy_narg & SYF_ARGMASK; memcpy(copyargs, ap, nap * sizeof(register_t)); if (nargs > nap) { @@ -922,7 +923,14 @@ td->td_retval[1] = 0; STOPEVENT(p, S_SCE, (callp->sy_narg & SYF_ARGMASK)); PTRACESTOP_SC(p, td, S_PT_SCE); +#ifdef MAC + error = mac_syscall_enter(td, args, code); + if (error == 0) + error = (*callp->sy_call)(td, args); + mac_syscall_exit(td, args, code, error); +#else error = (*callp->sy_call)(td, args); +#endif } switch (error) { case 0: ==== //depot/projects/trustedbsd/mac/sys/ia64/ia32/ia32_trap.c#4 (text+ko) ==== @@ -27,12 +27,15 @@ #include __FBSDID("$FreeBSD: src/sys/ia64/ia32/ia32_trap.c,v 1.5 2005/04/12 23:18:54 jhb Exp $"); +#include "opt_mac.h" + #include #include #include #include #include #include +#include #include #include #include @@ -92,9 +95,8 @@ code &= p->p_sysent->sv_mask; if (code >= p->p_sysent->sv_size) - callp = &p->p_sysent->sv_table[0]; - else - callp = &p->p_sysent->sv_table[code]; + code = 0; + callp = &p->p_sysent->sv_table[code]; narg = callp->sy_narg & SYF_ARGMASK; @@ -124,7 +126,14 @@ STOPEVENT(p, S_SCE, narg); +#ifdef MAC + eror = mac_syscall_enter(td, args64, code); + if (error == 0) + error = (*callp->sy_call)(td, args64); + mac_syscall_exit(td, args64, code, error); +#else error = (*callp->sy_call)(td, args64); +#endif } switch (error) { ==== //depot/projects/trustedbsd/mac/sys/ia64/ia64/trap.c#29 (text+ko) ==== @@ -33,6 +33,7 @@ #include "opt_ddb.h" #include "opt_ktrace.h" +#include "opt_mac.h" #include #include @@ -43,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -928,10 +930,9 @@ if (p->p_sysent->sv_mask) code &= p->p_sysent->sv_mask; - if (code >= p->p_sysent->sv_size) - callp = &p->p_sysent->sv_table[0]; - else - callp = &p->p_sysent->sv_table[code]; + if (code >= p->p_sysent->sv_size) + code = 0; + callp = &p->p_sysent->sv_table[code] #ifdef KTRACE if (KTRPOINT(td, KTR_SYSCALL)) @@ -949,12 +950,18 @@ /* * Grab Giant if the syscall is not flagged as MP safe. */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) { + if ((callp->sy_narg & SYF_MPSAFE) == 0) mtx_lock(&Giant); +#ifdef MAC + error = mac_syscall_enter(td, args, code); + if (error == 0) error = (*callp->sy_call)(td, args); + mac_syscall_exit(td, args, code, error); +#else + error = (*callp->sy_call)(td, args); +#endif + if ((callp->sy_narg & SYF_MPSAFE) == 0) mtx_unlock(&Giant); - } else - error = (*callp->sy_call)(td, args); if (error != EJUSTRETURN) { /* ==== //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/trap.c#19 (text+ko) ==== @@ -35,12 +35,14 @@ __FBSDID("$FreeBSD: src/sys/powerpc/powerpc/trap.c,v 1.54 2005/04/20 20:52:46 ps Exp $"); #include "opt_ktrace.h" +#include "opt_mac.h" #include #include #include #include #include +#include #include #include #include @@ -373,10 +375,9 @@ if (p->p_sysent->sv_mask) code &= p->p_sysent->sv_mask; - if (code >= p->p_sysent->sv_size) - callp = &p->p_sysent->sv_table[0]; - else - callp = &p->p_sysent->sv_table[code]; + if (code >= p->p_sysent->sv_size) + code = 0; + callp = &p->p_sysent->sv_table[code]; narg = callp->sy_narg & SYF_ARGMASK; @@ -410,7 +411,14 @@ STOPEVENT(p, S_SCE, narg); +#ifdef MAC + error = mac_syscall_enter(td, params, code); + if (error == 0) + error = (*callp->sy_call)(td, params); + mac_syscall_exit(td, params, code, error); +#else error = (*callp->sy_call)(td, params); +#endif CTR3(KTR_SYSC, "syscall: p=%s %s ret=%x", p->p_comm, syscallnames[code], td->td_retval[0]); ==== //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/trap.c#29 (text+ko) ==== @@ -43,6 +43,7 @@ #include "opt_ddb.h" #include "opt_ktr.h" #include "opt_ktrace.h" +#include "opt_mac.h" #include #include @@ -51,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -547,10 +549,9 @@ if (p->p_sysent->sv_mask) code &= p->p_sysent->sv_mask; - if (code >= p->p_sysent->sv_size) - callp = &p->p_sysent->sv_table[0]; - else - callp = &p->p_sysent->sv_table[code]; + if (code >= p->p_sysent->sv_size) + code = 0; + callp = &p->p_sysent->sv_table[code]; narg = callp->sy_narg & SYF_ARGMASK; @@ -589,7 +590,14 @@ PTRACESTOP_SC(p, td, S_PT_SCE); +#ifdef MAC + error = mac_syscall_enter(td, argp, code); + if (error == 0) + error = (*callp->sy_call)(td, argp); + mac_syscall_exit(td, argp, code, error); +#else error = (*callp->sy_call)(td, argp); +#endif CTR5(KTR_SYSC, "syscall: p=%p error=%d %s return %#lx %#lx ", p, error, syscallnames[code], td->td_retval[0], From owner-p4-projects@FreeBSD.ORG Sun Jul 10 04:45:41 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AA6916A421; Sun, 10 Jul 2005 04:45:40 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2373F16A41F for ; Sun, 10 Jul 2005 04:45:40 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C743443D53 for ; Sun, 10 Jul 2005 04:45:39 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6A4jdYF021575 for ; Sun, 10 Jul 2005 04:45:39 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6A4jdFr021572 for perforce@freebsd.org; Sun, 10 Jul 2005 04:45:39 GMT (envelope-from soc-cjones@freebsd.org) Date: Sun, 10 Jul 2005 04:45:39 GMT Message-Id: <200507100445.j6A4jdFr021572@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-cjones@freebsd.org using -f From: soc-cjones To: Perforce Change Reviews Cc: Subject: PERFORCE change 79891 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 04:45:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=79891 Change 79891 by soc-cjones@soc-cjones_ides on 2005/07/10 04:45:06 Flesh out 'rename' plan. Affected files ... .. //depot/projects/soc2005/gvinum/docs/PLAN#2 edit Differences ... ==== //depot/projects/soc2005/gvinum/docs/PLAN#2 (text+ko) ==== @@ -9,15 +9,51 @@ - _move - Identify -f flag, drive, object(s) from argv - - Do sanity checks (is object already on drive?) - - Check whether there's free space - - Instantiate a new object on target drive - - Copy, verify, remove original object + - Do sanity checks (is object already on drive?) [kernel-side] + - Check whether there's free space [kernel-side] + - Instantiate a new object on target drive [kernel-side] + - Copy, verify, remove original object [kernel-side] + + req = gctl_get_handle(); + gctl_ro_param(req, "class", -1, "VINUM"); + gctl_ro_param(req, "verb", -1, "move"); - _rename - Identify -r flag, object, new name from argv - - Rename object + - Rename object (call 'move' verb) - Recurse over descendants if applicable + req = gctl_get_handle(); + gctl_ro_param(req, "class", -1, "VINUM"); + gctl_ro_param(req, "verb", -1, "rename"); + gctl_ro_param(req, "cmd", -1, "rename"); + gctl_ro_param(req, "argc", sizeof(int), &argc); + gctl_ro_param(req, "flags", sizeof(int), &flags); + gctl_ro_param(req, "argvX", ... argvX ...); + gctl_ro_param(req, "object", -1, argv[..]); + gctl_ro_param(req, "newname", -1, argv[..]); + gctl_issue(req); + ... error handling + gctl_free(req); + return; + Kernel ====== + +* Add hooks for 'rename', 'move' verbs in + sys/geom/vinum/geom_vinum.c:gv_config + +* Add 'rename' verb to VINUM GEOM class + - use 'object' and 'newname' as verb arguments + - int gv_rename(struct g_geom *, struct gctl_req *) + - Find object (drive, vol, plex, sd) [gv_object_type] + - Get {drive, volume, plex, sd} struct pointer + - Change name by twiddling ->name + - Fix up references in other structures + - for gv_drive: FOREACH subdisks, fix ->drive + - for gv_plex: FOREACH subsdisks, fix ->plex + - Commit to disk + +* Add 'move' verb to VINUM GEOM class + + - int gv_move(struct g_geom *, struct gctl_req *) From owner-p4-projects@FreeBSD.ORG Sun Jul 10 04:53:51 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8399B16A420; Sun, 10 Jul 2005 04:53:50 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 59DC716A41C for ; Sun, 10 Jul 2005 04:53:50 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D42E43D46 for ; Sun, 10 Jul 2005 04:53:50 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6A4ropr028770 for ; Sun, 10 Jul 2005 04:53:50 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6A4roYL028767 for perforce@freebsd.org; Sun, 10 Jul 2005 04:53:50 GMT (envelope-from soc-cjones@freebsd.org) Date: Sun, 10 Jul 2005 04:53:50 GMT Message-Id: <200507100453.j6A4roYL028767@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-cjones@freebsd.org using -f From: soc-cjones To: Perforce Change Reviews Cc: Subject: PERFORCE change 79892 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 04:53:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=79892 Change 79892 by soc-cjones@soc-cjones_ides on 2005/07/10 04:53:11 Plan of attack for userland 'move'. Affected files ... .. //depot/projects/soc2005/gvinum/docs/PLAN#3 edit Differences ... ==== //depot/projects/soc2005/gvinum/docs/PLAN#3 (text+ko) ==== @@ -12,11 +12,23 @@ - Do sanity checks (is object already on drive?) [kernel-side] - Check whether there's free space [kernel-side] - Instantiate a new object on target drive [kernel-side] - - Copy, verify, remove original object [kernel-side] + - Copy, verify, remove original object [kernel-side] + (* --- extension to vinum; vinum destroyed old subdisk data) req = gctl_get_handle(); gctl_ro_param(req, "class", -1, "VINUM"); gctl_ro_param(req, "verb", -1, "move"); + gctl_ro_param(req, "cmd", -1, "move" | "mv"); + gctl_ro_param(req, "argc", sizeof(int), &argc); + gctl_ro_param(req, "flags", sizeof(int), &flags); + gctl_ro_param(req, "argvX", ...); + gctl_ro_param(req, "destination", -1, drive name); + gctl_ro_param(req, "objectX", -1, objectX name); + ... + gctl_issue(req); + ... error handling + gctl_free(req); + return; - _rename - Identify -r flag, object, new name from argv From owner-p4-projects@FreeBSD.ORG Sun Jul 10 05:23:28 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51CDB16A420; Sun, 10 Jul 2005 05:23:28 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 13A9D16A41C for ; Sun, 10 Jul 2005 05:23:28 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D347443D49 for ; Sun, 10 Jul 2005 05:23:27 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6A5NRGT029803 for ; Sun, 10 Jul 2005 05:23:27 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6A5NRBX029800 for perforce@freebsd.org; Sun, 10 Jul 2005 05:23:27 GMT (envelope-from soc-cjones@freebsd.org) Date: Sun, 10 Jul 2005 05:23:27 GMT Message-Id: <200507100523.j6A5NRBX029800@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-cjones@freebsd.org using -f From: soc-cjones To: Perforce Change Reviews Cc: Subject: PERFORCE change 79894 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 05:23:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=79894 Change 79894 by soc-cjones@soc-cjones_ides on 2005/07/10 05:22:31 Flesh out the kernel side of things for 'move'. Affected files ... .. //depot/projects/soc2005/gvinum/docs/PLAN#4 edit Differences ... ==== //depot/projects/soc2005/gvinum/docs/PLAN#4 (text+ko) ==== @@ -7,7 +7,9 @@ - Add NOPs for _rename, _move - - _move + - _move + (NOTE: arguments really should be 'src ... dst' for /bin/mv + compatibility) - Identify -f flag, drive, object(s) from argv - Do sanity checks (is object already on drive?) [kernel-side] - Check whether there's free space [kernel-side] @@ -64,8 +66,17 @@ - Fix up references in other structures - for gv_drive: FOREACH subdisks, fix ->drive - for gv_plex: FOREACH subsdisks, fix ->plex - - Commit to disk + - Commit config to disk * Add 'move' verb to VINUM GEOM class - + - use 'target', 'objectX' as verb arguments - int gv_move(struct g_geom *, struct gctl_req *) + - Find target, verify that it's a drive + - Find object(s) + - If drive, get list of drive's subdisks + - If plex, get list of plex's subdisks + - Check that sd(s) don't already belong to target drive + - gv_sd_to_drive + - How to copy data from old sd(s) to new? gv_sync maybe? + - Fix up references? + - Commit config to disk From owner-p4-projects@FreeBSD.ORG Sun Jul 10 06:36:57 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 145BC16A420; Sun, 10 Jul 2005 06:36:57 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BC41316A41C for ; Sun, 10 Jul 2005 06:36:56 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7804E43D46 for ; Sun, 10 Jul 2005 06:36:56 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6A6auXj034228 for ; Sun, 10 Jul 2005 06:36:56 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6A6auu8034225 for perforce@freebsd.org; Sun, 10 Jul 2005 06:36:56 GMT (envelope-from soc-cjones@freebsd.org) Date: Sun, 10 Jul 2005 06:36:56 GMT Message-Id: <200507100636.j6A6auu8034225@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-cjones@freebsd.org using -f From: soc-cjones To: Perforce Change Reviews Cc: Subject: PERFORCE change 79895 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 06:36:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=79895 Change 79895 by soc-cjones@soc-cjones_ides on 2005/07/10 06:36:22 Fully fleshed-out userland for gvinum 'move' Affected files ... .. //depot/projects/soc2005/gvinum/src/sbin/gvinum/gvinum.c#3 edit Differences ... ==== //depot/projects/soc2005/gvinum/src/sbin/gvinum/gvinum.c#3 (text+ko) ==== @@ -604,10 +604,71 @@ return; } +/* Note that move is currently of form '[-r] target object [...]' */ void gvinum_move(int argc, char **argv) { - /* NOP */ + struct gctl_req *req; + int flags = 0, i, j; + const char *errstr; + char buf[20], *cmd; + + if (argc) { + optreset = 1; + optind = 1; + cmd = argv[0]; + while ((j = getopt(argc, argv, "r")) != -1) { + switch (j) { + case 'r': + flags |= GV_FLAG_R; + break; + case '?': + default: + return; + } + } + argc -= optind; + argv += optind; + } + + req = gctl_get_handle(); + gctl_ro_param(req, "class", -1, "VINUM"); + gctl_ro_param(req, "verb", -1, "move"); + gctl_ro_param(req, "cmd", -1, cmd); + gctl_ro_param(req, "argc", sizeof(int), &argc); + gctl_ro_param(req, "flags", sizeof(int), &flags); + if (argc) { + for (i = 0; i < argc; i++) { + snprintf(buf, sizeof(buf), "argv%d", i); + gctl_ro_param(req, buf, -1, argv[i]); + } + } else { + warnx("no destination or object(s) to move specified"); + gctl_free(req); + return; + } + + /* We incremented argv such that the 0th argument is + the destination, and arguments 1..$ are the objects. */ + gctl_ro_param(req, "destination", -1, argv[0]); + if (argc > 1) { + for (i = 1; i < argc; i++) { + snprintf(buf, sizeof(buf), "object%d", i - 1); + gctl_ro_param(req, buf, -1, argv[i]); + } + } else { /* There isn't at least one object specified! */ + warnx("no object(s) to move specified"); + gctl_free(req); + return; + } + errstr = gctl_issue(req); + if (errstr != NULL) { + warnx("can't move object(s): %s", errstr); + gctl_free(req); + return; + } + gctl_free(req); + return; } void From owner-p4-projects@FreeBSD.ORG Sun Jul 10 06:50:14 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E0C416A420; Sun, 10 Jul 2005 06:50:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6013A16A41C for ; Sun, 10 Jul 2005 06:50:13 +0000 (GMT) (envelope-from soc-anders@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1538C43D49 for ; Sun, 10 Jul 2005 06:50:13 +0000 (GMT) (envelope-from soc-anders@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6A6oC5J034665 for ; Sun, 10 Jul 2005 06:50:12 GMT (envelope-from soc-anders@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6A6oCXF034652 for perforce@freebsd.org; Sun, 10 Jul 2005 06:50:12 GMT (envelope-from soc-anders@freebsd.org) Date: Sun, 10 Jul 2005 06:50:12 GMT Message-Id: <200507100650.j6A6oCXF034652@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-anders@freebsd.org using -f From: soc-anders To: Perforce Change Reviews Cc: Subject: PERFORCE change 79896 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 06:50:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=79896 Change 79896 by soc-anders@soc-anders_gimli on 2005/07/10 06:49:17 Interface information now exclusivly uses sysctl to obtain information and if_var.h references have been removed. Certain Issues remain: * No watchdog timer information is available (drop -t?) * Per address if_data information is not available * Multicast address are not displayed Affected files ... .. //depot/projects/soc2005/ifcleanup/src/src/usr.bin/netstat/if.c#3 edit Differences ... ==== //depot/projects/soc2005/ifcleanup/src/src/usr.bin/netstat/if.c#3 (text+ko) ==== @@ -47,15 +47,14 @@ #include #include -#include #include #include #include #include #include -#include +/*#include */ #include -#include +/*#include */ #include #include @@ -68,6 +67,7 @@ #ifdef IFCLEANUP #include +#include #endif #include "netstat.h" @@ -153,19 +153,6 @@ void intpr(int _interval, u_long ifnetaddr, void (*pfunc)(char *)) { - struct ifnet ifnet; - struct ifnethead ifnethead; - union { - struct ifaddr ifa; - struct in_ifaddr in; -#ifdef INET6 - struct in6_ifaddr in6; -#endif - struct ipx_ifaddr ipx; - } ifaddr; - u_long ifaddraddr; - u_long ifaddrfound; - u_long ifnetfound; u_long opackets; u_long ipackets; u_long obytes; @@ -175,27 +162,36 @@ u_long oerrors; u_long ierrors; u_long collisions; - short timer; - int drops; + /* short timer; */ + u_long drops; struct sockaddr *sa = NULL; char name[IFNAMSIZ]; short network_layer; short link_layer; + int mib[6] = {CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST, 0}; + size_t len; + char *buf, *cur, *end; + struct if_msghdr *ifm; + struct ifa_msghdr *ifam; + struct sockaddr *addr, *mask, *brd; + u_long mtu; + if (_interval) { sidewaysintpr((unsigned)_interval, ifnetaddr); return; } - else if (ifnetaddr == 0) { - printf("ifnet: symbol not defined\n"); + + if (sysctl(mib, 6, NULL, &len, NULL, 0) < 0) + return; + if ((buf = malloc(len)) == NULL) { + printf("malloc\n"); return; } - - if (kread(ifnetaddr, (char *)&ifnethead, sizeof ifnethead)) + if (sysctl(mib, 6, buf, &len, NULL, 0) < 0) { + free(buf); return; - ifnetaddr = (u_long)TAILQ_FIRST(&ifnethead); - if (kread(ifnetaddr, (char *)&ifnet, sizeof ifnet)) - return; + } if (!pfunc) { if (Wflag) @@ -216,186 +212,206 @@ printf(" %s", "Drop"); putchar('\n'); } - ifaddraddr = 0; - while (ifnetaddr || ifaddraddr) { + cur = buf; + end = cur + len; + while (cur < end) { struct sockaddr_in *sockin; + struct sockaddr_in *inmask; #ifdef INET6 struct sockaddr_in6 *sockin6; + struct sockaddr_in6 *in6mask; #endif char *cp; int n, m; network_layer = 0; link_layer = 0; + ifm = (struct if_msghdr *)cur; + ifam = NULL; + + if (ifm->ifm_type == RTM_IFINFO) { + struct sockaddr_dl *sdl; + if (!(ifm->ifm_addrs & RTA_IFP)) { + printf("Missing IFP\n"); + exit(1); + } + sa = (struct sockaddr *)(cur + sizeof(*ifm)); + addr = sa; + sdl = (struct sockaddr_dl *)sa; + strlcpy(name, sdl->sdl_data, sdl->sdl_nlen+1); + cur += ifm->ifm_msglen; + if (interface != 0 && (strcmp(name, interface) != 0)) + continue; + if ((ifm->ifm_flags & IFF_UP) == 0) { + cp = index(name, '\0'); + *cp++ = '*'; + *cp = '\0'; + } + mtu = ifm->ifm_data.ifi_mtu; - if (ifaddraddr == 0) { - ifnetfound = ifnetaddr; - if (kread(ifnetaddr, (char *)&ifnet, sizeof ifnet)) - return; - strlcpy(name, ifnet.if_xname, sizeof(name)); - ifnetaddr = (u_long)TAILQ_NEXT(&ifnet, if_link); - if (interface != 0 && (strcmp(name, interface) != 0)) - continue; - cp = index(name, '\0'); + } else if (ifm->ifm_type == RTM_NEWADDR) { + int addrs = ifm->ifm_addrs; + ifam = (struct ifa_msghdr *)cur; + cur += sizeof(*ifam); - if (pfunc) { - (*pfunc)(name); - continue; + while (addrs != 0) { + sa = (struct sockaddr *)cur; + cur += SA_SIZE(sa); + if (sa->sa_len == 0) + continue; + + if (addrs & RTA_NETMASK) { + mask = sa; + addrs &= ~RTA_NETMASK; + } else if (addrs & RTA_IFA) { + addr = sa; + addrs &= ~RTA_IFA; + } else if (addrs & RTA_BRD) { + brd = sa; + addrs &= ~RTA_BRD; + } } - - if ((ifnet.if_flags&IFF_UP) == 0) - *cp++ = '*'; - *cp = '\0'; - ifaddraddr = (u_long)TAILQ_FIRST(&ifnet.if_addrhead); + } else { + printf("Unknown message type: %d\n", ifm->ifm_type); + cur += ifm->ifm_msglen; + continue; } - ifaddrfound = ifaddraddr; /* * Get the interface stats. These may get * overriden below on a per-interface basis. */ - opackets = ifnet.if_opackets; - ipackets = ifnet.if_ipackets; - obytes = ifnet.if_obytes; - ibytes = ifnet.if_ibytes; - omcasts = ifnet.if_omcasts; - imcasts = ifnet.if_imcasts; - oerrors = ifnet.if_oerrors; - ierrors = ifnet.if_ierrors; - collisions = ifnet.if_collisions; - timer = ifnet.if_timer; - drops = ifnet.if_snd.ifq_drops; + if (ifm->ifm_type == RTM_IFINFO) { + opackets = ifm->ifm_data.ifi_opackets; + ipackets = ifm->ifm_data.ifi_ipackets; + obytes = ifm->ifm_data.ifi_obytes; + ibytes = ifm->ifm_data.ifi_ibytes; + omcasts = ifm->ifm_data.ifi_omcasts; + imcasts = ifm->ifm_data.ifi_imcasts; + oerrors = ifm->ifm_data.ifi_oerrors; + ierrors = ifm->ifm_data.ifi_ierrors; + collisions = ifm->ifm_data.ifi_collisions; + /* IFCLEANUP + * Timer info not available in if_data + * timer = ifnet.if_timer; + */ + drops = ifm->ifm_data.ifi_iqdrops; + } - if (ifaddraddr == 0) { - if (Wflag) - printf("%-7.7s", name); - else - printf("%-5.5s", name); - printf(" %5lu ", ifnet.if_mtu); + if (af != AF_UNSPEC && sa->sa_family != af) + continue; + + if (Wflag) + printf("%-7.7s", name); + else + printf("%-5.5s", name); + printf(" %5lu ", mtu); + switch (addr->sa_family) { + case AF_UNSPEC: printf("%-13.13s ", "none"); - printf("%-17.17s ", "none"); - } else { - if (kread(ifaddraddr, (char *)&ifaddr, sizeof ifaddr)) { - ifaddraddr = 0; - continue; - } -#define CP(x) ((char *)(x)) - cp = (CP(ifaddr.ifa.ifa_addr) - CP(ifaddraddr)) + - CP(&ifaddr); - sa = (struct sockaddr *)cp; - if (af != AF_UNSPEC && sa->sa_family != af) { - ifaddraddr = - (u_long)TAILQ_NEXT(&ifaddr.ifa, ifa_link); - continue; - } - if (Wflag) - printf("%-7.7s", name); - else - printf("%-5.5s", name); - printf(" %5lu ", ifnet.if_mtu); - switch (sa->sa_family) { - case AF_UNSPEC: - printf("%-13.13s ", "none"); - printf("%-15.15s ", "none"); - break; - case AF_INET: - sockin = (struct sockaddr_in *)sa; -#ifdef notdef - /* can't use inet_makeaddr because kernel - * keeps nets unshifted. - */ - in = inet_makeaddr(ifaddr.in.ia_subnet, - INADDR_ANY); - printf("%-13.13s ", netname(in.s_addr, - ifaddr.in.ia_subnetmask)); -#else - printf("%-13.13s ", - netname(htonl(ifaddr.in.ia_subnet), - ifaddr.in.ia_subnetmask)); -#endif - printf("%-17.17s ", - routename(sockin->sin_addr.s_addr)); + printf("%-15.15s ", "none"); + break; + case AF_INET: + inmask = (struct sockaddr_in *)mask; + sockin = (struct sockaddr_in *)addr; + + /* IFCLEANUP + * netname expects a network address and its mask + */ + printf("%-13.13s ", + netname(sockin->sin_addr.s_addr & + inmask->sin_addr.s_addr, + ntohl(inmask->sin_addr.s_addr))); + printf("%-17.17s ", + routename(sockin->sin_addr.s_addr)); - network_layer = 1; - break; -#ifdef INET6 - case AF_INET6: - sockin6 = (struct sockaddr_in6 *)sa; - printf("%-13.13s ", - netname6(&ifaddr.in6.ia_addr, - &ifaddr.in6.ia_prefixmask.sin6_addr)); - printf("%-17.17s ", - inet_ntop(AF_INET6, - &sockin6->sin6_addr, - ntop_buf, sizeof(ntop_buf))); + network_layer = 1; + break; +#ifdef INET6 + case AF_INET6: + in6mask = (struct sockaddr_in6 *)mask; + sockin6 = (struct sockaddr_in6 *)addr; - network_layer = 1; - break; + printf("%-13.13s ", + netname6(sockin6, &in6mask->sin6_addr)); + printf("%-17.17s ", + inet_ntop(AF_INET6, + &sockin6->sin6_addr, + ntop_buf, sizeof(ntop_buf))); + + network_layer = 1; + break; #endif /*INET6*/ - case AF_IPX: - { - struct sockaddr_ipx *sipx = - (struct sockaddr_ipx *)sa; - u_long net; - char netnum[10]; + case AF_IPX: + { + struct sockaddr_ipx *sipx = + (struct sockaddr_ipx *)addr; + u_long net; + char netnum[10]; + + *(union ipx_net *) &net = sipx->sipx_addr.x_net; + sprintf(netnum, "%lx", (u_long)ntohl(net)); + printf("ipx:%-8s ", netnum); + /* printf("ipx:%-8s ", netname(net, 0L)); */ + printf("%-17s ", + ipx_phost((struct sockaddr *)sipx)); + } - *(union ipx_net *) &net = sipx->sipx_addr.x_net; - sprintf(netnum, "%lx", (u_long)ntohl(net)); - printf("ipx:%-8s ", netnum); -/* printf("ipx:%-8s ", netname(net, 0L)); */ - printf("%-17s ", - ipx_phost((struct sockaddr *)sipx)); - } + network_layer = 1; + break; - network_layer = 1; - break; - - case AF_APPLETALK: - printf("atalk:%-12.12s ",atalk_print(sa,0x10) ); - printf("%-11.11s ",atalk_print(sa,0x0b) ); - break; - case AF_LINK: - { - struct sockaddr_dl *sdl = - (struct sockaddr_dl *)sa; - char linknum[10]; - cp = (char *)LLADDR(sdl); - n = sdl->sdl_alen; - sprintf(linknum, "", sdl->sdl_index); - m = printf("%-13.13s ", linknum); - } - goto hexprint; - default: - m = printf("(%d)", sa->sa_family); - for (cp = sa->sa_len + (char *)sa; - --cp > sa->sa_data && (*cp == 0);) {} - n = cp - sa->sa_data + 1; - cp = sa->sa_data; - hexprint: - while (--n >= 0) - m += printf("%02x%c", *cp++ & 0xff, + case AF_APPLETALK: + printf("atalk:%-12.12s ",atalk_print(sa,0x10) ); + printf("%-11.11s ",atalk_print(sa,0x0b) ); + break; + case AF_LINK: + { + struct sockaddr_dl *sdl = + (struct sockaddr_dl *)addr; + char linknum[10]; + cp = (char *)LLADDR(sdl); + n = sdl->sdl_alen; + sprintf(linknum, "", sdl->sdl_index); + m = printf("%-13.13s ", linknum); + } + goto hexprint; + default: + m = printf("(%d)", sa->sa_family); + for (cp = sa->sa_len + (char *)sa; + --cp > sa->sa_data && (*cp == 0);) {} + n = cp - sa->sa_data + 1; + cp = sa->sa_data; + hexprint: + while (--n >= 0) + m += printf("%02x%c", *cp++ & 0xff, n > 0 ? ':' : ' '); - m = 32 - m; - while (m-- > 0) - putchar(' '); - - link_layer = 1; - break; - } - - /* - * Fixup the statistics for interfaces that - * update stats for their network addresses - */ - if (network_layer) { - opackets = ifaddr.in.ia_ifa.if_opackets; - ipackets = ifaddr.in.ia_ifa.if_ipackets; - obytes = ifaddr.in.ia_ifa.if_obytes; - ibytes = ifaddr.in.ia_ifa.if_ibytes; - } - - ifaddraddr = (u_long)TAILQ_NEXT(&ifaddr.ifa, ifa_link); + m = 32 - m; + while (m-- > 0) + putchar(' '); + + link_layer = 1; + break; } + + /* + * Fixup the statistics for interfaces that + * update stats for their network addresses + */ + + /* IFCLEANUP + * Cannot handle this yet; ifa_msghdr does not + * contain socket if_data info. + */ + /* + if (network_layer) { + opackets = ifaddr.in.ia_ifa.if_opackets; + ipackets = ifaddr.in.ia_ifa.if_ipackets; + obytes = ifaddr.in.ia_ifa.if_obytes; + ibytes = ifaddr.in.ia_ifa.if_ibytes; + } + */ + + show_stat("lu", 8, ipackets, link_layer|network_layer); printf(" "); @@ -414,15 +430,24 @@ printf(" "); } show_stat("lu", 5, collisions, link_layer); + /* IFCLEANUP + * timer info not availble in if_data + */ + /* if (tflag) { printf(" "); show_stat("d", 3, timer, link_layer); } + */ if (dflag) { printf(" "); show_stat("d", 3, drops, link_layer); } putchar('\n'); + /* IFCLEANUP + * Skip mcast for now + */ +#if 0 if (aflag && ifaddrfound) { /* * Print family's multicast addresses @@ -490,6 +515,7 @@ } } } +#endif /* if 0 */ } } From owner-p4-projects@FreeBSD.ORG Sun Jul 10 06:55:20 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D0CE16A420; Sun, 10 Jul 2005 06:55:20 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F28D916A41C for ; Sun, 10 Jul 2005 06:55:19 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B19CD43D46 for ; Sun, 10 Jul 2005 06:55:19 +0000 (GMT) (envelope-from soc-cjones@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6A6tJ5j034885 for ; Sun, 10 Jul 2005 06:55:19 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6A6tJQl034882 for perforce@freebsd.org; Sun, 10 Jul 2005 06:55:19 GMT (envelope-from soc-cjones@freebsd.org) Date: Sun, 10 Jul 2005 06:55:19 GMT Message-Id: <200507100655.j6A6tJQl034882@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-cjones@freebsd.org using -f From: soc-cjones To: Perforce Change Reviews Cc: Subject: PERFORCE change 79897 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 06:55:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=79897 Change 79897 by soc-cjones@soc-cjones_ides on 2005/07/10 06:54:19 Userland for 'rename', plus simplification of error handling for 'move'. Affected files ... .. //depot/projects/soc2005/gvinum/src/sbin/gvinum/gvinum.c#4 edit Differences ... ==== //depot/projects/soc2005/gvinum/src/sbin/gvinum/gvinum.c#4 (text+ko) ==== @@ -617,10 +617,10 @@ optreset = 1; optind = 1; cmd = argv[0]; - while ((j = getopt(argc, argv, "r")) != -1) { + while ((j = getopt(argc, argv, "f")) != -1) { switch (j) { - case 'r': - flags |= GV_FLAG_R; + case 'f': + flags |= GV_FLAG_F; break; case '?': default: @@ -631,6 +631,17 @@ argv += optind; } + switch (argc) { + case 0: + warnx("no destination or object(s) to move specified"); + return; + case 1: + warnx("no object(s) to move specified"); + return; + default: + break; + } + req = gctl_get_handle(); gctl_ro_param(req, "class", -1, "VINUM"); gctl_ro_param(req, "verb", -1, "move"); @@ -641,26 +652,14 @@ for (i = 0; i < argc; i++) { snprintf(buf, sizeof(buf), "argv%d", i); gctl_ro_param(req, buf, -1, argv[i]); + if (i > 1) { /* argv[1..$] are objects to move */ + snprintf(buf, sizeof(buf), "object%d", i - 1); + gctl_ro_param(req, buf, -1, argv[i]); + } } - } else { - warnx("no destination or object(s) to move specified"); - gctl_free(req); - return; } - /* We incremented argv such that the 0th argument is - the destination, and arguments 1..$ are the objects. */ gctl_ro_param(req, "destination", -1, argv[0]); - if (argc > 1) { - for (i = 1; i < argc; i++) { - snprintf(buf, sizeof(buf), "object%d", i - 1); - gctl_ro_param(req, buf, -1, argv[i]); - } - } else { /* There isn't at least one object specified! */ - warnx("no object(s) to move specified"); - gctl_free(req); - return; - } errstr = gctl_issue(req); if (errstr != NULL) { warnx("can't move object(s): %s", errstr); @@ -763,7 +762,68 @@ void gvinum_rename(int argc, char **argv) { - /* NOP */ + struct gctl_req *req; + int flags = 0, i, j; + const char *errstr; + char buf[20], *cmd; + + if (argc) { + optreset = 1; + optind = 1; + cmd = argv[0]; + while ((j = getopt(argc, argv, "r")) != -1) { + switch (j) { + case 'r': + flags |= GV_FLAG_R; + break; + case '?': + default: + return; + } + } + argc -= optind; + argv += optind; + } + + switch (argc) { + case 0: + warnx("no object to rename specified"); + return; + case 1: + warnx("no new name specified"); + return; + case 2: + break; + default: + warnx("more than one new name specified"); + return; + } + + req = gctl_get_handle(); + gctl_ro_param(req, "class", -1, "VINUM"); + gctl_ro_param(req, "verb", -1, "move"); + gctl_ro_param(req, "cmd", -1, cmd); + gctl_ro_param(req, "argc", sizeof(int), &argc); + gctl_ro_param(req, "flags", sizeof(int), &flags); + + if (argc) { + for (i = 0; i < argc; i++) { + snprintf(buf, sizeof(buf), "argv%d", i); + gctl_ro_param(req, buf, -1, argv[i]); + } + } + + gctl_ro_param(req, "object", -1, argv[0]); + gctl_ro_param(req, "newname", -1, argv[1]); + + errstr = gctl_issue(req); + if (errstr != NULL) { + warnx("can't rename object: %s", errstr); + gctl_free(req); + return; + } + gctl_free(req); + return; } void From owner-p4-projects@FreeBSD.ORG Sun Jul 10 10:57:20 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAE7816A420; Sun, 10 Jul 2005 10:57:19 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A775516A41C for ; Sun, 10 Jul 2005 10:57:19 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7719943D4C for ; Sun, 10 Jul 2005 10:57:19 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6AAvJVo050702 for ; Sun, 10 Jul 2005 10:57:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6AAvJWR050699 for perforce@freebsd.org; Sun, 10 Jul 2005 10:57:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 10 Jul 2005 10:57:19 GMT Message-Id: <200507101057.j6AAvJWR050699@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 79905 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 10:57:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=79905 Change 79905 by rwatson@rwatson_zoo on 2005/07/10 10:56:45 Use the uid and gid requested by the caller when creating a device node, rather than always using the uid and gid in the passed cloning credential. This allows the caller to decide which to use and where -- for example, selecting the credential's uid, but a gid of 'tty'. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_conf.c#14 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_conf.c#14 (text+ko) ==== @@ -419,9 +419,8 @@ dev->si_cred = crhold(cr); else dev->si_cred = NULL; - dev->si_uid = cr ? cr->cr_uid : uid; - dev->si_gid = cr ? cr->cr_gid : gid; - dev->si_cred = cr ? crhold (cr) : NULL; + dev->si_uid = uid; + dev->si_gid = gid; dev->si_mode = mode; devfs_create(dev); From owner-p4-projects@FreeBSD.ORG Sun Jul 10 11:05:31 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E33D16A420; Sun, 10 Jul 2005 11:05:31 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CA00416A41C for ; Sun, 10 Jul 2005 11:05:30 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 07B1543D53 for ; Sun, 10 Jul 2005 11:05:30 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6AB5T8J051216 for ; Sun, 10 Jul 2005 11:05:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6AB5Th7051213 for perforce@freebsd.org; Sun, 10 Jul 2005 11:05:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 10 Jul 2005 11:05:29 GMT Message-Id: <200507101105.j6AB5Th7051213@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 79906 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 11:05:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=79906 Change 79906 by rwatson@rwatson_zoo on 2005/07/10 11:04:52 Integrate trustedbsd_sebsd branch: - mac_syscall_enter() for non-i386. - MAC_SUIDACL added to NOTES and kernel ompile - mac_chkexec strsep() simplification and SMP VFS support Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/alpha/alpha/trap.c#9 integrate .. //depot/projects/trustedbsd/sebsd/sys/amd64/amd64/trap.c#11 integrate .. //depot/projects/trustedbsd/sebsd/sys/arm/arm/trap.c#3 integrate .. //depot/projects/trustedbsd/sebsd/sys/conf/NOTES#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/conf/options#15 integrate .. //depot/projects/trustedbsd/sebsd/sys/ia64/ia32/ia32_trap.c#3 integrate .. //depot/projects/trustedbsd/sebsd/sys/ia64/ia64/trap.c#13 integrate .. //depot/projects/trustedbsd/sebsd/sys/powerpc/powerpc/trap.c#7 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/mac_chkexec/mac_chkexec.c#3 integrate .. //depot/projects/trustedbsd/sebsd/sys/security/mac_portacl/mac_portacl.c#10 integrate .. //depot/projects/trustedbsd/sebsd/sys/sparc64/sparc64/trap.c#10 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/getfhash/getfhash.c#2 integrate .. //depot/projects/trustedbsd/sebsd/usr.sbin/getfhash/setfhash.8#3 integrate Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/alpha/alpha/trap.c#9 (text+ko) ==== @@ -32,6 +32,7 @@ /* #include "opt_fix_unaligned_vax_fp.h" */ #include "opt_ddb.h" #include "opt_ktrace.h" +#include "opt_mac.h" #include #include @@ -42,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -687,10 +689,9 @@ if (p->p_sysent->sv_mask) code &= p->p_sysent->sv_mask; - if (code >= p->p_sysent->sv_size) - callp = &p->p_sysent->sv_table[0]; - else - callp = &p->p_sysent->sv_table[code]; + if (code >= p->p_sysent->sv_size) + code = 0; + callp = &p->p_sysent->sv_table[code]; nargs = (callp->sy_narg & SYF_ARGMASK) + hidden; switch (nargs) { @@ -734,7 +735,14 @@ PTRACESTOP_SC(p, td, S_PT_SCE); +#ifdef MAC + error = mac_syscall_enter(td, args + hidden, code); + if (error == 0) + error = (*callp->sy_call)(td, args + hidden); + mac_syscall_exit(td, args + hidden, code, error); +#else error = (*callp->sy_call)(td, args + hidden); +#endif } ==== //depot/projects/trustedbsd/sebsd/sys/amd64/amd64/trap.c#11 (text+ko) ==== @@ -48,6 +48,7 @@ #include "opt_cpu.h" #include "opt_isa.h" #include "opt_ktrace.h" +#include "opt_mac.h" #include #include @@ -59,6 +60,7 @@ #include #include #include +#include #include #include #include @@ -740,10 +742,9 @@ if (p->p_sysent->sv_mask) code &= p->p_sysent->sv_mask; - if (code >= p->p_sysent->sv_size) - callp = &p->p_sysent->sv_table[0]; - else - callp = &p->p_sysent->sv_table[code]; + if (code >= p->p_sysent->sv_size) + code = 0; + callp = &p->p_sysent->sv_table[code]; narg = callp->sy_narg & SYF_ARGMASK; @@ -779,12 +780,18 @@ PTRACESTOP_SC(p, td, S_PT_SCE); - if ((callp->sy_narg & SYF_MPSAFE) == 0) { + if ((callp->sy_narg & SYF_MPSAFE) == 0) mtx_lock(&Giant); +#ifdef MAC + error = mac_syscall_enter(td, argp, code); + if (error == 0) error = (*callp->sy_call)(td, argp); + mac_syscall_exit(td, argp, code, error); +#else + error = (*callp->sy_call)(td, argp); +#endif + if ((callp->sy_narg & SYF_MPSAFE) == 0) mtx_unlock(&Giant); - } else - error = (*callp->sy_call)(td, argp); } switch (error) { ==== //depot/projects/trustedbsd/sebsd/sys/arm/arm/trap.c#3 (text+ko) ==== @@ -80,6 +80,7 @@ #include "opt_ktrace.h" +#include "opt_mac.h" #include __FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.15 2005/05/25 13:46:32 cognet Exp $"); @@ -91,6 +92,7 @@ #include #include #include +#include #include #include #include @@ -894,9 +896,8 @@ if (p->p_sysent->sv_mask) code &= p->p_sysent->sv_mask; if (code >= p->p_sysent->sv_size) - callp = &p->p_sysent->sv_table[0]; - else - callp = &p->p_sysent->sv_table[code]; + code = 0; + callp = &p->p_sysent->sv_table[code]; nargs = callp->sy_narg & SYF_ARGMASK; memcpy(copyargs, ap, nap * sizeof(register_t)); if (nargs > nap) { @@ -922,7 +923,14 @@ td->td_retval[1] = 0; STOPEVENT(p, S_SCE, (callp->sy_narg & SYF_ARGMASK)); PTRACESTOP_SC(p, td, S_PT_SCE); +#ifdef MAC + error = mac_syscall_enter(td, args, code); + if (error == 0) + error = (*callp->sy_call)(td, args); + mac_syscall_exit(td, args, code, error); +#else error = (*callp->sy_call)(td, args); +#endif } switch (error) { case 0: ==== //depot/projects/trustedbsd/sebsd/sys/conf/NOTES#13 (text+ko) ==== @@ -966,6 +966,7 @@ options MAC options MAC_BIBA options MAC_BSDEXTENDED +options MAC_CHKEXEC options MAC_DEBUG options MAC_IFOFF options MAC_LOMAC @@ -974,6 +975,7 @@ options MAC_PARTITION options MAC_PORTACL options MAC_SEEOTHERUIDS +options MAC_SUIDACL options MAC_STUB options MAC_TEST ==== //depot/projects/trustedbsd/sebsd/sys/conf/options#15 (text+ko) ==== @@ -106,6 +106,7 @@ MAC_PARTITION opt_dontuse.h MAC_PORTACL opt_dontuse.h MAC_SEEOTHERUIDS opt_dontuse.h +MAC_SUIDACL opt_dontuse.h MAC_STATIC opt_mac.h MAC_STUB opt_dontuse.h MAC_TEST opt_dontuse.h ==== //depot/projects/trustedbsd/sebsd/sys/ia64/ia32/ia32_trap.c#3 (text+ko) ==== @@ -27,12 +27,15 @@ #include __FBSDID("$FreeBSD: src/sys/ia64/ia32/ia32_trap.c,v 1.5 2005/04/12 23:18:54 jhb Exp $"); +#include "opt_mac.h" + #include #include #include #include #include #include +#include #include #include #include @@ -92,9 +95,8 @@ code &= p->p_sysent->sv_mask; if (code >= p->p_sysent->sv_size) - callp = &p->p_sysent->sv_table[0]; - else - callp = &p->p_sysent->sv_table[code]; + code = 0; + callp = &p->p_sysent->sv_table[code]; narg = callp->sy_narg & SYF_ARGMASK; @@ -124,7 +126,14 @@ STOPEVENT(p, S_SCE, narg); +#ifdef MAC + eror = mac_syscall_enter(td, args64, code); + if (error == 0) + error = (*callp->sy_call)(td, args64); + mac_syscall_exit(td, args64, code, error); +#else error = (*callp->sy_call)(td, args64); +#endif } switch (error) { ==== //depot/projects/trustedbsd/sebsd/sys/ia64/ia64/trap.c#13 (text+ko) ==== @@ -33,6 +33,7 @@ #include "opt_ddb.h" #include "opt_ktrace.h" +#include "opt_mac.h" #include #include @@ -43,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -928,10 +930,9 @@ if (p->p_sysent->sv_mask) code &= p->p_sysent->sv_mask; - if (code >= p->p_sysent->sv_size) - callp = &p->p_sysent->sv_table[0]; - else - callp = &p->p_sysent->sv_table[code]; + if (code >= p->p_sysent->sv_size) + code = 0; + callp = &p->p_sysent->sv_table[code] #ifdef KTRACE if (KTRPOINT(td, KTR_SYSCALL)) @@ -949,12 +950,18 @@ /* * Grab Giant if the syscall is not flagged as MP safe. */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) { + if ((callp->sy_narg & SYF_MPSAFE) == 0) mtx_lock(&Giant); +#ifdef MAC + error = mac_syscall_enter(td, args, code); + if (error == 0) error = (*callp->sy_call)(td, args); + mac_syscall_exit(td, args, code, error); +#else + error = (*callp->sy_call)(td, args); +#endif + if ((callp->sy_narg & SYF_MPSAFE) == 0) mtx_unlock(&Giant); - } else - error = (*callp->sy_call)(td, args); if (error != EJUSTRETURN) { /* ==== //depot/projects/trustedbsd/sebsd/sys/powerpc/powerpc/trap.c#7 (text+ko) ==== @@ -35,12 +35,14 @@ __FBSDID("$FreeBSD: src/sys/powerpc/powerpc/trap.c,v 1.54 2005/04/20 20:52:46 ps Exp $"); #include "opt_ktrace.h" +#include "opt_mac.h" #include #include #include #include #include +#include #include #include #include @@ -373,10 +375,9 @@ if (p->p_sysent->sv_mask) code &= p->p_sysent->sv_mask; - if (code >= p->p_sysent->sv_size) - callp = &p->p_sysent->sv_table[0]; - else - callp = &p->p_sysent->sv_table[code]; + if (code >= p->p_sysent->sv_size) + code = 0; + callp = &p->p_sysent->sv_table[code]; narg = callp->sy_narg & SYF_ARGMASK; @@ -410,7 +411,14 @@ STOPEVENT(p, S_SCE, narg); +#ifdef MAC + error = mac_syscall_enter(td, params, code); + if (error == 0) + error = (*callp->sy_call)(td, params); + mac_syscall_exit(td, params, code, error); +#else error = (*callp->sy_call)(td, params); +#endif CTR3(KTR_SYSC, "syscall: p=%s %s ret=%x", p->p_comm, syscallnames[code], td->td_retval[0]); ==== //depot/projects/trustedbsd/sebsd/sys/security/mac_chkexec/mac_chkexec.c#3 (text+ko) ==== @@ -505,10 +505,9 @@ static int mac_chkexec_check_depends(struct vnode *vp, struct ucred *cred) { - char *depends, **ap, *paths[10]; - int error, i, npaths; struct nameidata nd; - int alen; + char *depends, *ap; + int alen, error; size_t ealen; ASSERT_VOP_LOCKED(vp, "no vlock held"); @@ -525,28 +524,28 @@ depends = malloc(alen + 1, M_CHKEXEC, M_WAITOK | M_ZERO); error = vn_extattr_get(vp, IO_NODELOCKED, MAC_CHKEXEC_ATTRN, MAC_CHKEXEC_DEP, &alen, depends, curthread); - for (npaths = 0, ap = paths; - (*ap = strsep(&depends, ":")) != NULL; npaths++) - if (**ap != '\0') - if (++ap >= &paths[10]) - break; - for (i = 0; i < npaths; i++) { - NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, - UIO_SYSSPACE, paths[i], curthread); + if (error) { + free(depends, M_CHKEXEC); + return (error); + } + for (; (ap = strsep(&depends, ":")) != NULL && error == 0;) { + if (strlen(ap) == 0) + continue; + mtx_lock(&Giant); + NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_SYSSPACE, + ap, curthread); if ((error = namei(&nd)) != 0) { free(depends, M_CHKEXEC); + mtx_unlock(&Giant); return (error); } error = mac_chkexec_check(nd.ni_vp, cred); NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_vp); - if (error) { - free(depends, M_CHKEXEC); - return (error); - } + mtx_unlock(&Giant); } free(depends, M_CHKEXEC); - return (0); + return (error); } static int @@ -840,15 +839,18 @@ CTR0(KTR_MAC, "mac_chkexec_check: invalid checksum algorithm"); return (EPERM); } - NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, - UIO_USERSPACE, arg, td); - if ((error = namei(&nd)) != 0) + /* XXX MPSAFE VFS */ + mtx_lock(&Giant); + NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_USERSPACE, arg, td); + if ((error = namei(&nd)) != 0) { + mtx_unlock(&Giant); return (error); - error = ha->crypto_hash(nd.ni_vp, - curthread->td_ucred, digest); + } + error = ha->crypto_hash(nd.ni_vp, td->td_ucred, digest); if (error) { NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_vp); + mtx_unlock(&Giant); return (error); } bzero(&vcsum, sizeof(vcsum)); @@ -857,6 +859,7 @@ error = mac_chkexec_set_vcsum(nd.ni_vp, &vcsum); NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_vp); + mtx_unlock(&Giant); return (error); } ==== //depot/projects/trustedbsd/sebsd/sys/security/mac_portacl/mac_portacl.c#10 (text+ko) ==== ==== //depot/projects/trustedbsd/sebsd/sys/sparc64/sparc64/trap.c#10 (text+ko) ==== @@ -43,6 +43,7 @@ #include "opt_ddb.h" #include "opt_ktr.h" #include "opt_ktrace.h" +#include "opt_mac.h" #include #include @@ -51,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -547,10 +549,9 @@ if (p->p_sysent->sv_mask) code &= p->p_sysent->sv_mask; - if (code >= p->p_sysent->sv_size) - callp = &p->p_sysent->sv_table[0]; - else - callp = &p->p_sysent->sv_table[code]; + if (code >= p->p_sysent->sv_size) + code = 0; + callp = &p->p_sysent->sv_table[code]; narg = callp->sy_narg & SYF_ARGMASK; @@ -589,7 +590,14 @@ PTRACESTOP_SC(p, td, S_PT_SCE); +#ifdef MAC + error = mac_syscall_enter(td, argp, code); + if (error == 0) + error = (*callp->sy_call)(td, argp); + mac_syscall_exit(td, argp, code, error); +#else error = (*callp->sy_call)(td, argp); +#endif CTR5(KTR_SYSC, "syscall: p=%p error=%d %s return %#lx %#lx ", p, error, syscallnames[code], td->td_retval[0], ==== //depot/projects/trustedbsd/sebsd/usr.sbin/getfhash/getfhash.c#2 (text+ko) ==== @@ -142,8 +142,8 @@ static void process_depends(const char *pathname) { - char **av, *depends[10], *dependlist; - int ndeps, error, i, j; + char *av, *dependlist; + int error, j; ssize_t nbytes; nbytes = extattr_get_file(pathname, MAC_CHKEXEC_ATTRN, @@ -162,17 +162,14 @@ error = extattr_get_file(pathname, MAC_CHKEXEC_ATTRN, MAC_CHKEXEC_DEP, dependlist, nbytes); dependlist[nbytes] = '\0'; - for (ndeps = 0, av = depends; - (*av = strsep(&dependlist, ":")) != NULL; ndeps++) - if (**av != '\0') - if (++av > &depends[10]) - break; depth++; - for (i = 0; i < ndeps; i++) { + for (; (av = strsep(&dependlist, ":")) != NULL;) { + if (strlen(av) == 0) + continue; for (j = 0; j < depth; j++) fputs(" ", stdout); - print_hash(depends[i]); - } + print_hash(av); + } depth--; } ==== //depot/projects/trustedbsd/sebsd/usr.sbin/getfhash/setfhash.8#3 (text+ko) ==== @@ -54,7 +54,8 @@ When setting dependencies, they must be listed previous to the system object which requires them. Multiple dependencies may exist and must be separated by a -colon when entered. It should be noted that dependency pathnames +colon when entered. +It should be noted that dependency pathnames will be looked up relative to the calling process's root. .El .Sh EXAMPLES From owner-p4-projects@FreeBSD.ORG Sun Jul 10 11:08:35 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2229F16A420; Sun, 10 Jul 2005 11:08:35 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EEC7516A41C for ; Sun, 10 Jul 2005 11:08:34 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B957D43D49 for ; Sun, 10 Jul 2005 11:08:34 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6AB8YdA051356 for ; Sun, 10 Jul 2005 11:08:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6AB8Ys4051353 for perforce@freebsd.org; Sun, 10 Jul 2005 11:08:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 10 Jul 2005 11:08:34 GMT Message-Id: <200507101108.j6AB8Ys4051353@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 79908 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 11:08:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=79908 Change 79908 by rwatson@rwatson_zoo on 2005/07/10 11:08:26 LIBSEPOL definition. Affected files ... .. //depot/projects/trustedbsd/sebsd/share/mk/bsd.libnames.mk#11 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/share/mk/bsd.libnames.mk#11 (text+ko) ==== @@ -121,6 +121,7 @@ LIBSBUF?= ${DESTDIR}${LIBDIR}/libsbuf.a LIBSDP?= ${DESTDIR}${LIBDIR}/libsdp.a LIBSEBSD?= ${DESTDIR}${LIBDIR}/libsebsd.a +LIBSEPOL?= ${DESTDIR}${LIBDIR}/libsepol.a LIBSMB?= ${DESTDIR}${LIBDIR}/libsmb.a LIBSSH?= ${DESTDIR}${LIBDIR}/libssh.a LIBSSL?= ${DESTDIR}${LIBDIR}/libssl.a From owner-p4-projects@FreeBSD.ORG Sun Jul 10 11:48:25 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27C1F16A420; Sun, 10 Jul 2005 11:48:25 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 01CD716A41C for ; Sun, 10 Jul 2005 11:48:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B11FA43D45 for ; Sun, 10 Jul 2005 11:48:24 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6ABmOE2053488 for ; Sun, 10 Jul 2005 11:48:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6ABmOiq053485 for perforce@freebsd.org; Sun, 10 Jul 2005 11:48:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 10 Jul 2005 11:48:24 GMT Message-Id: <200507101148.j6ABmOiq053485@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 79912 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 11:48:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=79912 Change 79912 by rwatson@rwatson_zoo on 2005/07/10 11:47:49 Stub man page for SEBSD. Affected files ... .. //depot/projects/trustedbsd/sebsd/share/man/man4/Makefile#13 edit .. //depot/projects/trustedbsd/sebsd/share/man/man4/sebsd.4#1 add Differences ... ==== //depot/projects/trustedbsd/sebsd/share/man/man4/Makefile#13 (text+ko) ==== @@ -264,6 +264,7 @@ sched_ule.4 \ screen.4 \ scsi.4 \ + sebsd.4 \ sem.4 \ ses.4 \ sf.4 \ From owner-p4-projects@FreeBSD.ORG Sun Jul 10 11:49:27 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE7FF16A420; Sun, 10 Jul 2005 11:49:26 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A7D2E16A41C for ; Sun, 10 Jul 2005 11:49:26 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7741843D48 for ; Sun, 10 Jul 2005 11:49:26 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6ABnQb1053519 for ; Sun, 10 Jul 2005 11:49:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6ABnQxk053516 for perforce@freebsd.org; Sun, 10 Jul 2005 11:49:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 10 Jul 2005 11:49:26 GMT Message-Id: <200507101149.j6ABnQxk053516@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 79913 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 11:49:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=79913 Change 79913 by rwatson@rwatson_zoo on 2005/07/10 11:49:20 NO_SEBSD will allow the SEBSD-specific components, such as SEBSD kernel module, libraries, and tools, as well as disable parts of SEBSD-related modifications in various tools and utilities, allowing the building of a system largely free of SEBSD if desired. Affected files ... .. //depot/projects/trustedbsd/sebsd/share/examples/etc/make.conf#8 edit .. //depot/projects/trustedbsd/sebsd/share/man/man5/make.conf.5#9 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/share/examples/etc/make.conf#8 (text+ko) ==== @@ -139,6 +139,7 @@ #NO_PF= # do not build PF firewall package #NO_PROFILE= # Avoid compiling profiled libraries #NO_RCMDS= # do not build or install BSD r* commands (rsh, etc). +#NO_SEBSD= # do not built SEBSD kernel module or related programs #NO_SENDMAIL= # do not build sendmail and related programs #NO_SHARE= # do not go into the share subdir #NO_SHARED= # build /bin and /sbin dynamically linked (bad idea ==== //depot/projects/trustedbsd/sebsd/share/man/man5/make.conf.5#9 (text+ko) ==== @@ -524,6 +524,11 @@ .Va NO_KERBEROS and .Va NO_OPENSSH ) . +.It Va NO_SEBSD +.Pq Vt bool +Set to not build +.Xr sebsd 4 +and related programs. .It Va NO_SENDMAIL .Pq Vt bool Set to not build From owner-p4-projects@FreeBSD.ORG Sun Jul 10 11:51:30 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 605DE16A420; Sun, 10 Jul 2005 11:51:30 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 23EC316A41C for ; Sun, 10 Jul 2005 11:51:30 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D36C143D45 for ; Sun, 10 Jul 2005 11:51:29 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6ABpTPe053751 for ; Sun, 10 Jul 2005 11:51:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6ABpTGD053747 for perforce@freebsd.org; Sun, 10 Jul 2005 11:51:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 10 Jul 2005 11:51:29 GMT Message-Id: <200507101151.j6ABpTGD053747@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 79915 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 11:51:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=79915 Change 79915 by rwatson@rwatson_zoo on 2005/07/10 11:51:25 Implement NO_SEBSD, which controls the building of many SEBSD-related tools, libraries, and the inclusion of SEBSD-specific functionality into some base system components. Affected files ... .. //depot/projects/trustedbsd/sebsd/lib/Makefile#16 edit .. //depot/projects/trustedbsd/sebsd/sbin/Makefile#12 edit .. //depot/projects/trustedbsd/sebsd/sys/modules/Makefile#14 edit .. //depot/projects/trustedbsd/sebsd/usr.bin/login/Makefile#6 edit .. //depot/projects/trustedbsd/sebsd/usr.bin/login/login.c#9 edit .. //depot/projects/trustedbsd/sebsd/usr.sbin/Makefile#13 edit .. //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/Makefile#4 edit .. //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/database.c#5 edit .. //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/do_command.c#7 edit .. //depot/projects/trustedbsd/sebsd/usr.sbin/pwd_mkdb/Makefile#4 edit .. //depot/projects/trustedbsd/sebsd/usr.sbin/pwd_mkdb/pwd_mkdb.c#7 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/lib/Makefile#16 (text+ko) ==== @@ -34,7 +34,7 @@ libpmc ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \ libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} \ - libsebsd libsepol + ${_libsebsd} ${_libsepol} .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) _csu=csu/${MACHINE_ARCH}-elf @@ -77,6 +77,11 @@ _libio= libio .endif +.if !defined(NO_SEBSD) +_libsebsd= libsebsd +_libsepol= libsepol +.endif + .if !defined(NO_SENDMAIL) _libmilter= libmilter _libsm= libsm ==== //depot/projects/trustedbsd/sebsd/sbin/Makefile#12 (text+ko) ==== @@ -81,8 +81,8 @@ rtsol \ savecore \ ${_sconfig} \ - sebsd_checkpolicy \ - sebsd_setfiles \ + ${_sebsd_checkpolicy} \ + ${_sebsd_setfiles} \ setfsmac \ shutdown \ slattach \ @@ -111,6 +111,11 @@ _pflogd= pflogd .endif +.if !defined(NO_SEBSD) +_sebsd_checkpolicy= sebsd_checkpolicy +_sebsd_setfiles= sebsd_setfiles +.endif + .if !defined(NO_INET6) _ip6fw= ip6fw _ping6= ping6 ==== //depot/projects/trustedbsd/sebsd/sys/modules/Makefile#14 (text+ko) ==== @@ -204,7 +204,7 @@ sbsh \ scd \ ${_scsi_low} \ - sebsd \ + ${_sebsd} \ sf \ ${_sio} \ sis \ @@ -309,6 +309,10 @@ _pf= pf .endif +.if !defined(NO_SEBSD) || defined(ALL_MODULES) +_sebsd= sebsd +.endif + .if ${MACHINE_ARCH} == "i386" # XXX some of these can move to the general case when de-i386'ed # XXX some of these can move now, but are untested on other architectures. ==== //depot/projects/trustedbsd/sebsd/usr.bin/login/Makefile#6 (text+ko) ==== @@ -3,18 +3,25 @@ PROG= login SRCS= login.c login_fbtab.c -CFLAGS+=-I${.CURDIR}/../../lib/libsebsd -CFLAGS+=-I${.CURDIR}/../../contrib/sebsd/libselinux/include -CFLAGS+=-I${.CURDIR}/../../sys -CFLAGS+=-I${.CURDIR}/../../sys/security/sebsd CFLAGS+=-DLOGALL -DPADD= ${LIBUTIL} ${LIBPAM} ${LIBSEBSD} -LDADD= -lutil ${MINUSLPAM} -lsebsd +DPADD= ${LIBUTIL} ${LIBPAM} +LDADD= -lutil ${MINUSLPAM} MAN= login.1 login.access.5 + .if !defined(NO_SETUID_LOGIN) BINOWN= root BINMODE=4555 PRECIOUSPROG= .endif +.if !defined(NO_SEBSD) +CFLAGS+=-I${.CURDIR}/../../lib/libsebsd +CFLAGS+=-I${.CURDIR}/../../contrib/sebsd/libselinux/include +CFLAGS+=-I${.CURDIR}/../../sys +CFLAGS+=-I${.CURDIR}/../../sys/security/sebsd +CFLAGS+=-DSEBSD +DPADD+= ${LIBSEBSD} +LDADD+= -lsebsd +.endif + .include ==== //depot/projects/trustedbsd/sebsd/usr.bin/login/login.c#9 (text+ko) ==== @@ -139,7 +139,9 @@ static char *username; /* user name */ static char *olduser; /* previous user name */ +#ifdef SEBSD static char *user_role; /* role/type specified with username */ +#endif /* * Prompts @@ -295,6 +297,7 @@ badlogin(olduser); } +#ifdef SEBSD char *rp = username; while (*rp && *rp != '/') rp++; @@ -302,6 +305,8 @@ *rp = 0; user_role = rp+1; } +#endif + /* * Load the PAM policy and set some variables */ @@ -508,6 +513,7 @@ username, tty); } +#ifdef SEBSD /* * Determine if we must execute a transition when we * run our shell, for MAC policies which require it. For now, @@ -594,6 +600,7 @@ mac_free(newttylabel); } nosebsd: +#endif /* !SEBSD */ /* * Destroy environment unless user has requested its ==== //depot/projects/trustedbsd/sebsd/usr.sbin/Makefile#13 (text+ko) ==== @@ -146,8 +146,8 @@ rwhod \ sa \ ${_sendmail} \ - sebsd_loadpolicy \ - sebsd_newrole \ + ${_sebsd_loadpolicy} \ + ${_sebsd_newrole} \ setkey \ setpmac \ ${_sicontrol} \ @@ -244,6 +244,11 @@ _lpr= lpr .endif +.if !defined(NO_SEBSD) +_sebsd_loadpolicy= sebsd_loadpolicy +.sebsd_newrole= sebsd_newrole +.endif + .if !defined(NO_SENDMAIL) _editmap= editmap _mailstats= mailstats ==== //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/Makefile#4 (text+ko) ==== @@ -4,10 +4,16 @@ MAN= cron.8 SRCS= cron.c database.c do_command.c job.c user.c popen.c -CFLAGS+= -I${.CURDIR}/../../../sys CFLAGS+= -DLOGIN_CAP -DPADD= ${LIBCRON} ${LIBUTIL} ${LIBSEBSD} -LDADD= ${LIBCRON} -lutil -lsebsd +DPADD= ${LIBCRON} ${LIBUTIL} +LDADD= ${LIBCRON} -lutil + +.if !defined(SEBSD) +CFLAGS+= -I${.CURDIR}/../../../sys +CFLAGS+= -DSEBSD +DPADD+= ${LIBSEBSD} +LDADD+= -lsebsd +.endif .include ==== //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/database.c#5 (text+ko) ==== @@ -253,6 +253,7 @@ free_user(u); log_it(fname, getpid(), "RELOAD", tabname); } +#ifdef SEBSD if (is_selinux_enabled()) { /* * Perform a virtual entrypoint access decision on @@ -300,6 +301,7 @@ goto next_crontab; } } +#endif /* !SEBSD */ u = load_user(crontab_fd, pw, fname); if (u != NULL) { u->mtime = statbuf->st_mtime; ==== //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/do_command.c#7 (text+ko) ==== @@ -274,6 +274,7 @@ _exit(OK_EXIT); } # endif /*DEBUGGING*/ +#ifdef SEBSD if (is_selinux_enabled()) { mac_t mac; char *context, *labeltext, *argv[4]; @@ -301,12 +302,15 @@ argv[3] = NULL; mac_execve(shell, argv, e->envp, mac); } else { +#endif /* !SEBSD */ execle(shell, shell, "-c", e->cmd, (char *)0, e->envp); +#ifdef SEBSD } warn("execl: couldn't exec `%s'", shell); _exit(ERROR_EXIT); } +#endif /* !SEBSD */ break; default: /* parent process */ ==== //depot/projects/trustedbsd/sebsd/usr.sbin/pwd_mkdb/Makefile#4 (text+ko) ==== @@ -10,4 +10,8 @@ WARNS?= 4 CFLAGS+= -I${.CURDIR}/../../lib/libc/gen # for pw_scan.h +.if !defined(NO_SEBSD) +CFLAGS+= -DSEBSD +.endif + .include ==== //depot/projects/trustedbsd/sebsd/usr.sbin/pwd_mkdb/pwd_mkdb.c#7 (text+ko) ==== @@ -721,6 +721,7 @@ errno = sverrno; error(buf); } +#ifdef SEBSD if (label) { mac_t mac; if (mac_from_text(&mac, label)) { @@ -732,6 +733,7 @@ return; } } +#endif /* !SEBSD */ } void From owner-p4-projects@FreeBSD.ORG Sun Jul 10 13:41:56 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6061016A420; Sun, 10 Jul 2005 13:41:55 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 14FB016A41C for ; Sun, 10 Jul 2005 13:41:55 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A529243D46 for ; Sun, 10 Jul 2005 13:41:54 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6ADfslC065019 for ; Sun, 10 Jul 2005 13:41:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6ADfhsS065016 for perforce@freebsd.org; Sun, 10 Jul 2005 13:41:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 10 Jul 2005 13:41:43 GMT Message-Id: <200507101341.j6ADfhsS065016@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 79917 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 13:41:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=79917 Change 79917 by rwatson@rwatson_zoo on 2005/07/10 13:40:45 Integrate trustedbsd_base: - MAINTAINERS policy - distribute32 target - amd update - gcc update - bzip-related security fixes - various ipfilter updates - OpenPAM Figwort - sendmail update - tcpdump fixes - OpenSSH update - OpenBSD dhclient - Yet more HWPMC - less rexecd - wpa_supplicant - fortunes - libarchive time work, flags portability. - i386_set_gsbase() - preadv()/pwritev() - Kqueue file system restructuring - ELF format system cores for additional architectures - libthr.3 man page, libthr fixen - ggate protocol and implementation retrofit - if_bridge, stp - linux_getpriority() - Much cleanup of emulation system call paths -- kern_getfsstat(), MPSAFE flag propagation, MPSAFE SMP handling, MPSAFE network stack handling, etc. - IPI_PREEMPTION - M_DEVBUF instances modified to make debugging memory leaks easier. - cleaner freebsd32 kevent emulation for freebsd64 - svr4 emulation cleanup - ng_tcpmss - src/sys/gnu/fs rename. - COMPAT_FEEBSD5 - if_alloc()/if_free() now dynamically allocate and free ifnet structures separately from softc, so lots of adaptationn. Likewise, ifnet type data is now allocated and freed. - The normal set of device IDs, etc. - Many sundry device driver changes, untold numbers of them to do with changes in the relationship between network interface device driver softc structures and ifnet structures. - support for debugging i386 processes on amd64 - Loop-back of audit event ID insertion into additional ibcs2-related system call vectors. - Allow kqueue locking to know about things other than mutexes protecting event queues, so that vnode lock can be used to protect vnode event queues. - Prison support for further restricting the set of visible file systems in jail. - curthread pointer in KTR. - p_cansee() in ktrace(). - Mbuf wrapper around UMA now does memory trashing and checking. - Less Giant in kernel resource limit code. - Sched_ule fixen for threading and preemption. - Improved real-time clock locking. - Loop back of mac_.*sysv_sema() -> mac_.*syv_sem() rename. - Loop back of mac_check_socket_create(). - KTR_VFS - Locking pre and post-conditions in VFS now more cleanly handled, with KEVENT/etc happening in the VOP wrappers. - bridge alignment check and fix. - Loop back of mac_copy_mbuf() replacing mac_create_mbuf_from_mbuf(). - 802.11 learns about forcing. - netinet/in.c and netinet6/in6.c use IFF_LOCKGIANT() around if_ioctls. - inpcb and TCP/UDP locking assertions and fixes to do wih tear-down, de-spl'ing of UDP. - Continued libalias kernel adaptation. - TCP SACK bugfixes and optimizations. - Locking for so_emuldata - VA_EXECVE_ATIME -- update access time for execution events on vnode. - UMA_BOOT_PAGES expanded. Affected files ... .. //depot/projects/trustedbsd/base/LOCKS#1 branch .. //depot/projects/trustedbsd/base/MAINTAINERS#30 integrate .. //depot/projects/trustedbsd/base/Makefile#39 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#62 integrate .. //depot/projects/trustedbsd/base/UPDATING#56 integrate .. //depot/projects/trustedbsd/base/bin/chflags/chflags.1#9 integrate .. //depot/projects/trustedbsd/base/bin/dd/dd.1#12 integrate .. //depot/projects/trustedbsd/base/bin/ls/cmp.c#9 integrate .. //depot/projects/trustedbsd/base/bin/ls/extern.h#11 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.1#27 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.c#25 integrate .. //depot/projects/trustedbsd/base/bin/ls/util.c#14 integrate .. //depot/projects/trustedbsd/base/bin/rmail/Makefile#8 integrate .. //depot/projects/trustedbsd/base/bin/rmdir/rmdir.1#7 integrate .. //depot/projects/trustedbsd/base/bin/sh/expand.c#15 integrate .. //depot/projects/trustedbsd/base/bin/sh/sh.1#20 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amd/amd.8#5 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amq/amq.8#5 integrate .. //depot/projects/trustedbsd/base/contrib/amd/amq/pawd.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fixmount/fixmount.8#6 integrate .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsinfo.8#7 integrate .. //depot/projects/trustedbsd/base/contrib/amd/hlfsd/hlfsd.8#6 integrate .. //depot/projects/trustedbsd/base/contrib/amd/mk-amd-map/mk-amd-map.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/amd/scripts/amd.conf.5#6 integrate .. //depot/projects/trustedbsd/base/contrib/amd/wire-test/wire-test.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/sparc-opc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bzip2/bzip2.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/com_err/compile_et.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/diff/diff.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog#16 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/Makefile.in#14 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/attribs.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/builtins.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-common.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-decl.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-format.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-opts.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-parse.in#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-ppoutput.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-semantics.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-typeck.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c.opt#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/calls.c#16 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfglayout.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfgrtl.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/collect2.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/combine.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/common.opt#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config.gcc#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config.in#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/alpha.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/alpha.h#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/alpha.md#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/qrnnd.asm#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/t-osf4#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm-protos.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm.md#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/t-netbsd#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/t-rtems#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/darwin-protos.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/darwin.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/darwin.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/freebsd-spec.h#14 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/freebsd.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/cygwin1.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/darwin.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/emmintrin.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/freebsd.h#19 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/gthr-win32.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386-modes.def#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386-protos.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.h#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.md#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-rtems-i386#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xmmintrin.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/ia64.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/t-glibc#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/t-glibc-libunwind#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/t-hpux#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/unwind-ia64.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/unwind-ia64.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix41.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix43.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix52.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/altivec.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/altivec.md#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/beos.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/eabi.asm#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/freebsd.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/libgcc-ppc64.ver#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/linux-unwind.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/linux.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/linux64.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000-c.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000-protos.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.md#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rtems.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/spe.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/spe.md#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/sysv4.h#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-aix43#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-aix52#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-linux64#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-newas#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-rtems#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/s390.md#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/tpf.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparc.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparc.md#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/t-elf#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-libunwind#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-libunwind-elf#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-slibgcc-darwin#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-slibgcc-elf-ver#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-slibgcc-sld#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/configure#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/configure.ac#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp-demangle.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog#16 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/Make-lang.in#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/call.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/class.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cp-tree.h#14 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cvt.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cxx-pretty-print.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/decl.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/decl2.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/error.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/except.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/g++spec.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/init.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/mangle.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/method.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/name-lookup.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/parser.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/pt.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/search.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/semantics.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/tree.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/typeck.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/typeck2.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cppfiles.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cpplib.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cppmacro.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/crtstuff.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cse.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cselib.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cselib.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/dbxout.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/defaults.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/extend.texi#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/include/gcc-common.texi#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/invoke.texi#14 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/md.texi#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/tm.texi#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/trouble.texi#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/dojump.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/dwarf2out.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/emit-rtl.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/explow.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/expmed.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/expr.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/expr.h#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/ChangeLog#15 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/bld.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/malloc.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/news.texi#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/flow.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/fold-const.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/function.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gcc.c#16 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gcov-io.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gcse.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ginclude/stddef.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gthr-win32.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/hooks.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/hooks.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ifcvt.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/jump.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/libgcc-darwin.ver#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/libgcc-std.ver#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/libgcc2.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/libgcc2.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/loop-unroll.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/loop.c#17 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/mkheaders.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/mklibgcc.in#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/objc/objc-act.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/params.def#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/params.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/postreload.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/predict.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/real.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/reg-stack.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/regclass.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/regrename.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/regs.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/reload.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/reload1.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/rtl.h#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/sibcall.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/simplify-rtx.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/target-def.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/target.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/toplev.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/tree-inline.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/tree.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/tree.h#13 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/unwind-compat.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/unwind-compat.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/unwind-dw2-fde-compat.c#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/unwind-dw2-fde-glibc.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/unwind-dw2.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/varasm.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/version.c#16 integrate .. //depot/projects/trustedbsd/base/contrib/hostapd/COPYING#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/ChangeLog#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/Makefile#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/README#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/accounting.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/accounting.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/aes.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/aes_wrap.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/aes_wrap.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/ap.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/common.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/config.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/config.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/crypto.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/crypto.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/ctrl_iface.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/ctrl_iface.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/defconfig#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/defs.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/developer.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/driver.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/driver_test.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/driver_wired.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_defs.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_gtc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_i.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_identity.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_md5.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_mschapv2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_peap.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim_common.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim_common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim_db.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim_db.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_tls.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_tls_common.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_tls_common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_tlv.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_ttls.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_ttls.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eapol_sm.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eapol_sm.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eloop.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/eloop.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/hostap_common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.accept#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.conf#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.deny#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.eap_user#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.radius_clients#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.sim_db#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.wpa_psk#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd_cli.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd_ctrl.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd_ctrl.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/iapp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/iapp.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_11.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_11.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_11_auth.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_11_auth.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_1x.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_1x.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/l2_packet.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/madwifi.conf#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/md5.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/md5.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/ms_funcs.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/ms_funcs.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/radius.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/radius.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/radius_client.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/radius_client.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/radius_server.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/radius_server.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/rc4.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/rc4.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/sha1.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/sha1.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/sta_info.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/sta_info.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/tls.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/tls_none.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/tls_openssl.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/version.h#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/wired.conf#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/wpa.c#1 branch .. //depot/projects/trustedbsd/base/contrib/hostapd/wpa.h#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/IPFILTER.LICENCE#4 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/QNX_OCL.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_fil_freebsd.c#2 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_htable.c#2 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_htable.h#2 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_irc_pxy.c#2 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_lookup.c#2 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_lookup.h#2 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_pool.c#2 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_pool.h#2 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_pptp_pxy.c#2 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_rpcb_pxy.c#2 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_scan.c#2 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_scan.h#2 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_sync.c#2 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_sync.h#2 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ipf_dotuning.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/FREEBSD-upgrade#11 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/LICENSE#2 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/Makefile#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/Makefile.conf#6 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/Makefile.dist#5 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/README#9 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/RELNOTES#9 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/Makefile.dist#5 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/clparse.c#8 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/dhclient-script.8#7 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/dhclient.8#7 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/dhclient.c#14 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/dhclient.conf#2 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/dhclient.conf.5#8 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/dhclient.leases.5#5 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/scripts/freebsd#7 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/Makefile.dist#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/alloc.c#5 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/bpf.c#6 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/comapi.c#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/conflex.c#6 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/ctrace.c#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/dhcp-eval.5#5 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/dhcp-options.5#7 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/discover.c#6 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/dispatch.c#7 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/dlpi.c#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/dns.c#5 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/ethernet.c#5 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/execute.c#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/fddi.c#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/icmp.c#5 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/inet.c#5 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/iscprint.c#2 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/lpf.c#5 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/memory.c#5 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/nit.c#5 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/options.c#7 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/packet.c#5 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/parse.c#7 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/print.c#8 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/raw.c#5 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/resolv.c#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/socket.c#5 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/tables.c#7 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/tr.c#5 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/tree.c#5 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/upf.c#5 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/configure#5 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/contrib/3.0b1-lease-convert#2 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/contrib/sethostname.sh#2 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dhcpctl/Makefile.dist#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dhcpctl/callback.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dhcpctl/cltest.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dhcpctl/dhcpctl.3#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dhcpctl/dhcpctl.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dhcpctl/dhcpctl.h#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dhcpctl/omshell.1#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dhcpctl/omshell.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dhcpctl/remote.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dst/Makefile.dist#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dst/base64.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dst/dst_api.c#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dst/dst_internal.h#2 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dst/dst_support.c#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dst/hmac_link.c#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dst/md5.h#2 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dst/md5_dgst.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dst/md5_locl.h#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dst/prandom.c#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/arpa/nameser.h#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/arpa/nameser_compat.h#2 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/cdefs.h#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/cf/freebsd.h#6 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/ctrace.h#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/dhcp.h#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/dhcpd.h#11 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/dhctoken.h#5 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/failover.h#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/inet.h#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/isc-dhcp/boolean.h#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/isc-dhcp/dst.h#2 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/isc-dhcp/int.h#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/isc-dhcp/lang.h#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/isc-dhcp/list.h#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/isc-dhcp/result.h#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/isc-dhcp/types.h#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/minires/minires.h#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/minires/res_update.h#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/minires/resolv.h#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/netinet/if_ether.h#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/netinet/ip.h#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/netinet/ip_icmp.h#2 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/netinet/udp.h#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/omapip/alloc.h#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/omapip/buffer.h#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/omapip/convert.h#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/omapip/hash.h#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/omapip/omapip.h#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/omapip/omapip_p.h#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/omapip/trace.h#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/osdep.h#5 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/site.h#5 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/statement.h#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/tree.h#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/version.h#9 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/Makefile.dist#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/ns_date.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/ns_name.c#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/ns_parse.c#5 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/ns_samedomain.c#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/ns_sign.c#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/ns_verify.c#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/res_comp.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/res_findzonecut.c#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/res_init.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/res_mkquery.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/res_mkupdate.c#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/res_query.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/res_send.c#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/res_sendsigned.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/res_update.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/Makefile.dist#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/alloc.c#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/array.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/auth.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/buffer.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/connection.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/convert.c#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/dispatch.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/errwarn.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/generic.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/handle.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/hash.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/inet_addr.c#2 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/listener.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/message.c#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/mrtrace.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/omapi.3#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/protocol.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/result.c#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/support.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/test.c#4 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/toisc.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/trace.c#3 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/site.conf#2 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/tests/failover/dhcp-1.cf#2 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/tests/failover/dhcp-2.cf#2 delete .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/tests/failover/new-failover#2 delete .. //depot/projects/trustedbsd/base/contrib/libf2c/ChangeLog#12 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/err.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libobjc/ChangeLog#14 integrate .. //depot/projects/trustedbsd/base/contrib/libobjc/gc.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/ChangeLog#15 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/ChangeLog-2004#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/README#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/acconfig.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/acinclude.m4#11 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/aclocal.m4#11 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config.h.in#9 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/alpha-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/arm-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/hppa-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/i386-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/i486-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/ia64-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/m68k-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/mips-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/powerpc-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/s390-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/s390x-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/sparc-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/x86_64-linux-gnu/32/baseline_symbols.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/x86_64-linux-gnu/baseline_symbols.txt#3 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/io/basic_file_stdio.cc#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/io/c_io_stdio.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/linker-map.gnu#7 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/generic/c_locale.cc#6 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/generic/c_locale.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/generic/time_members.cc#6 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/gnu/c_locale.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/gnu/monetary_members.cc#7 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/gnu/time_members.cc#7 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/ieee_1003.1-2001/codecvt_specializations.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/configure#12 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/configure.ac#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/configure.host#6 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/crossconfig.m4#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/Makefile.am#9 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/Makefile.in#9 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/basic_string.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/basic_string.tcc#8 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/boost_concept_check.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/c++config#13 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/fstream.tcc#9 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/ios_base.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/istream.tcc#9 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/locale_facets.h#10 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/locale_facets.tcc#13 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/sstream.tcc#7 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/stl_algo.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/stl_algobase.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/stl_list.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/stl_tree.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/vector.tcc#3 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/debug/map.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/ext/pool_allocator.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/ext/rope#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/ext/ropeimpl.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/std/std_complex.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/std/std_fstream.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/std/std_memory.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/std/std_sstream.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/libsupc++/eh_globals.cc#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/linkage.m4#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/allocator.cc#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/debug.cc#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/ios.cc#8 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/ios_init.cc#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/locale_init.cc#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/localename.cc#9 integrate .. //depot/projects/trustedbsd/base/contrib/netcat/nc.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/CREDITS#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/HISTORY#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/MANIFEST#15 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/Makefile.am#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/RELNOTES#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/aclocal.m4#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/autogen.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/bin/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/bin/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/bin/su/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/bin/su/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/configure#4 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/Makefile.am#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_borrow_cred.3#15 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_free_data.3#15 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_free_envlist.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_get_option.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_log.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_nullconv.3#13 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_readline.3#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_restore_cred.3#15 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_set_option.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_ttyconv.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#20 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.conf.5#1 branch .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_acct_mgmt.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_authenticate.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_chauthtok.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_close_session.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_conv.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_end.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_error.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_authtok.3#19 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_data.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_item.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_user.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenv.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenvlist.3#19 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_info.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_open_session.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_prompt.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_putenv.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_data.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_item.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setcred.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setenv.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_authenticate.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_chauthtok.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_close_session.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_open_session.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_setcred.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_start.3#19 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_strerror.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_verror.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vinfo.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vprompt.3#18 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam_version.h#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/Makefile.am#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dynamic.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_load.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_readline.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_ttyconv.c#19 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/ltmain.sh#4 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/misc/gendoc.pl#15 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_deny/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_deny/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_deny/pam_deny.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_permit/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_permit/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_unix/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_unix/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/pnpinfo/pnpinfo.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/FREEBSD-upgrade#18 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/RELEASE_NOTES#15 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/README#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/submit.cf#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/version.m4#15 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/freebsd6.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/doc/op/op.me#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/conf.h#13 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/sem.h#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/shm.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/Makefile.m4#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/ldap.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/sem.c#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/shm.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-sem.c#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-shm.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/README#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/TRACEFLAGS#9 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/collect.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/conf.c#16 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/daemon.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/deliver.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/domain.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/envelope.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/map.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/mci.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/milter.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/parseaddr.c#14 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/queue.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sendmail.h#15 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/srvrsmtp.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/tls.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/usersmtp.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/version.c#15 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-bgp.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-isoclns.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-rsvp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/COPYING#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ChangeLog#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/Makefile#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/README#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/aes.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/aes_wrap.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/aes_wrap.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/common.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/config.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/config.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/config_ssid.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/crypto.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/crypto.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ctrl_iface.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ctrl_iface.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/defconfig#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/defs.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/developer.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/wpa_supplicant.fig#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/driver.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/drivers.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_aka.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_defs.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_fast.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_gtc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_i.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_leap.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_md5.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_mschapv2.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_otp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_peap.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_psk.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_sim.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_sim_common.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_sim_common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_testing.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_tls.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_tls_common.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_tls_common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_tlv.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_tlv.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_ttls.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_ttls.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eapol_sm.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eapol_sm.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eapol_test.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eloop.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eloop.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/hostap_common.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/l2_packet.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/md5.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/md5.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ms_funcs.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ms_funcs.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/openssl-tls-extensions.patch#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/pcsc_funcs.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/pcsc_funcs.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/preauth_test.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/radius.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/radius.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/radius_client.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/radius_client.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/rc4.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/rc4.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/sha1.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/sha1.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tls.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tls_none.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tls_openssl.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/todo.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/version.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_cli.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_ctrl.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_ctrl.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_passphrase.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_supplicant.c#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_supplicant.conf#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_supplicant.h#1 branch .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_supplicant_i.h#1 branch .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/su/Makefile.am#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/su/su.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ChangeLog#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/FREEBSD-tricks#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/FREEBSD-upgrade#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/INSTALL#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/LICENCE#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/Makefile.in#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/README#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/README.platform#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/README.privsep#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/TODO#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/WARNING.RNG#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/acconfig.h#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/audit-bsm.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/audit.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/audit.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/auth-bsdauth.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-chall.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-krb5.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-options.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-pam.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-pam.h#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-passwd.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-rsa.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-shadow.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-sia.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-sia.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth.h#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth1.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-chall.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-kbdint.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-none.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-passwd.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-pubkey.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2.c#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/authfile.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/bufaux.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/bufaux.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/buffer.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/buffer.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/buildpkg.sh.in#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/canohost.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/canohost.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/channels.c#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/channels.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/cipher-ctr.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/cipher.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/clientloop.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/clientloop.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/compat.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/compat.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/config.guess#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/config.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/configure.ac#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/defines.h#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/hostfile.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/hostfile.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/includes.h#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/key.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/log.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/loginrec.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/loginrec.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/misc.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/misc.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/moduli#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/moduli.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_mm.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_wrap.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_wrap.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-arc4random.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-cray.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-cray.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-misc.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-misc.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-openpty.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-snprintf.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/fake-rfc2553.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/getrrsetbyname.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/inet_ntop.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/mktemp.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-aix.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-aix.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/readpassphrase.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/realpath.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/xmmap.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/packet.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/readconf.c#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/readconf.h#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/readpass.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/Makefile#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/agent-ptrace.sh#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/brokenkeys.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/regress/dynamic-forward.sh#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/envpass.sh#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/login-timeout.sh#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/multiplex.sh#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/reexec.sh#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/rekey.sh#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/scp.sh#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/regress/sftp-glob.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/regress/sshd-log-wrapper.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/regress/test-exec.sh#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scp.1#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scp.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/servconf.c#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/servconf.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/session.c#22 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-client.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-client.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp.1#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-add.1#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-add.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-agent.c#14 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keygen.1#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keygen.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keyscan.1#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keyscan.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keysign.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-rand-helper.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.1#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.c#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh1.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config#17 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config.5#13 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd.8#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd.c#15 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config#18 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config.5#15 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/survey.sh.in#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/uidswap.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/version.h#17 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#45 integrate .. //depot/projects/trustedbsd/base/etc/devd.conf#16 integrate .. //depot/projects/trustedbsd/base/etc/etc.sparc64/ttys#9 integrate .. //depot/projects/trustedbsd/base/etc/ftpusers#9 integrate .. //depot/projects/trustedbsd/base/etc/group#9 integrate .. //depot/projects/trustedbsd/base/etc/inetd.conf#15 integrate .. //depot/projects/trustedbsd/base/etc/mail/aliases#10 integrate .. //depot/projects/trustedbsd/base/etc/master.passwd#11 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#30 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.local.dist#30 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.root.dist#11 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jul 10 14:52:56 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 773A316A420; Sun, 10 Jul 2005 14:52:55 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 13B6D16A41C; Sun, 10 Jul 2005 14:52:55 +0000 (GMT) (envelope-from csjp@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A0E5843D48; Sun, 10 Jul 2005 14:52:54 +0000 (GMT) (envelope-from csjp@FreeBSD.org) Received: from freefall.freebsd.org (csjp@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j6AEqs8w023622; Sun, 10 Jul 2005 14:52:54 GMT (envelope-from csjp@freefall.freebsd.org) Received: (from csjp@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j6AEqsiH023621; Sun, 10 Jul 2005 14:52:54 GMT (envelope-from csjp) Date: Sun, 10 Jul 2005 14:52:54 +0000 From: "Christian S.J. Peron" To: Robert Watson Message-ID: <20050710145254.GA22896@freefall.freebsd.org> References: <200507101341.j6ADfhsS065016@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200507101341.j6ADfhsS065016@repoman.freebsd.org> User-Agent: Mutt/1.4.2.1i Cc: Perforce Change Reviews Subject: Re: PERFORCE change 79917 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 14:52:56 -0000 Hooray! On Sun, Jul 10, 2005 at 01:41:43PM +0000, Robert Watson wrote: > http://perforce.freebsd.org/chv.cgi?CH=79917 > > Change 79917 by rwatson@rwatson_zoo on 2005/07/10 13:40:45 > > Integrate trustedbsd_base: > > - MAINTAINERS policy > - distribute32 target > - amd update > - gcc update > - bzip-related security fixes > - various ipfilter updates > - OpenPAM Figwort > - sendmail update > - tcpdump fixes > - OpenSSH update > - OpenBSD dhclient > - Yet more HWPMC > - less rexecd > - wpa_supplicant > - fortunes > - libarchive time work, flags portability. > - i386_set_gsbase() > - preadv()/pwritev() > - Kqueue file system restructuring > - ELF format system cores for additional architectures > - libthr.3 man page, libthr fixen > - ggate protocol and implementation retrofit > - if_bridge, stp > - linux_getpriority() > - Much cleanup of emulation system call paths -- kern_getfsstat(), > MPSAFE flag propagation, MPSAFE SMP handling, MPSAFE network > stack handling, etc. > - IPI_PREEMPTION > - M_DEVBUF instances modified to make debugging memory leaks > easier. > - cleaner freebsd32 kevent emulation for freebsd64 > - svr4 emulation cleanup > - ng_tcpmss > - src/sys/gnu/fs rename. > - COMPAT_FEEBSD5 > - if_alloc()/if_free() now dynamically allocate and free ifnet > structures separately from softc, so lots of adaptationn. > Likewise, ifnet type data is now allocated and freed. > - The normal set of device IDs, etc. > - Many sundry device driver changes, untold numbers of them to do > with changes in the relationship between network interface > device driver softc structures and ifnet structures. > - support for debugging i386 processes on amd64 > - Loop-back of audit event ID insertion into additional > ibcs2-related system call vectors. > - Allow kqueue locking to know about things other than mutexes > protecting event queues, so that vnode lock can be used to > protect vnode event queues. > - Prison support for further restricting the set of visible file > systems in jail. > - curthread pointer in KTR. > - p_cansee() in ktrace(). > - Mbuf wrapper around UMA now does memory trashing and checking. > - Less Giant in kernel resource limit code. > - Sched_ule fixen for threading and preemption. > - Improved real-time clock locking. > - Loop back of mac_.*sysv_sema() -> mac_.*syv_sem() rename. > - Loop back of mac_check_socket_create(). > - KTR_VFS > - Locking pre and post-conditions in VFS now more cleanly handled, > with KEVENT/etc happening in the VOP wrappers. > - bridge alignment check and fix. > - Loop back of mac_copy_mbuf() replacing > mac_create_mbuf_from_mbuf(). > - 802.11 learns about forcing. > - netinet/in.c and netinet6/in6.c use IFF_LOCKGIANT() around > if_ioctls. > - inpcb and TCP/UDP locking assertions and fixes to do wih > tear-down, de-spl'ing of UDP. > - Continued libalias kernel adaptation. > - TCP SACK bugfixes and optimizations. > - Locking for so_emuldata > - VA_EXECVE_ATIME -- update access time for execution events on > vnode. > - UMA_BOOT_PAGES expanded. > > Affected files ... > > .. //depot/projects/trustedbsd/base/LOCKS#1 branch > .. //depot/projects/trustedbsd/base/MAINTAINERS#30 integrate > .. //depot/projects/trustedbsd/base/Makefile#39 integrate > .. //depot/projects/trustedbsd/base/Makefile.inc1#62 integrate > .. //depot/projects/trustedbsd/base/UPDATING#56 integrate > .. //depot/projects/trustedbsd/base/bin/chflags/chflags.1#9 integrate > .. //depot/projects/trustedbsd/base/bin/dd/dd.1#12 integrate > .. //depot/projects/trustedbsd/base/bin/ls/cmp.c#9 integrate > .. //depot/projects/trustedbsd/base/bin/ls/extern.h#11 integrate > .. //depot/projects/trustedbsd/base/bin/ls/ls.1#27 integrate > .. //depot/projects/trustedbsd/base/bin/ls/ls.c#25 integrate > .. //depot/projects/trustedbsd/base/bin/ls/util.c#14 integrate > .. //depot/projects/trustedbsd/base/bin/rmail/Makefile#8 integrate > .. //depot/projects/trustedbsd/base/bin/rmdir/rmdir.1#7 integrate > .. //depot/projects/trustedbsd/base/bin/sh/expand.c#15 integrate > .. //depot/projects/trustedbsd/base/bin/sh/sh.1#20 integrate > .. //depot/projects/trustedbsd/base/contrib/amd/amd/amd.8#5 integrate > .. //depot/projects/trustedbsd/base/contrib/amd/amq/amq.8#5 integrate > .. //depot/projects/trustedbsd/base/contrib/amd/amq/pawd.1#4 integrate > .. //depot/projects/trustedbsd/base/contrib/amd/fixmount/fixmount.8#6 integrate > .. //depot/projects/trustedbsd/base/contrib/amd/fsinfo/fsinfo.8#7 integrate > .. //depot/projects/trustedbsd/base/contrib/amd/hlfsd/hlfsd.8#6 integrate > .. //depot/projects/trustedbsd/base/contrib/amd/mk-amd-map/mk-amd-map.8#4 integrate > .. //depot/projects/trustedbsd/base/contrib/amd/scripts/amd.conf.5#6 integrate > .. //depot/projects/trustedbsd/base/contrib/amd/wire-test/wire-test.8#4 integrate > .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/sparc-opc.c#4 integrate > .. //depot/projects/trustedbsd/base/contrib/bzip2/bzip2.c#4 integrate > .. //depot/projects/trustedbsd/base/contrib/com_err/compile_et.1#2 integrate > .. //depot/projects/trustedbsd/base/contrib/diff/diff.c#3 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog#16 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/Makefile.in#14 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/attribs.c#6 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/builtins.c#11 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/c-common.c#10 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/c-decl.c#15 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/c-format.c#10 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/c-opts.c#3 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/c-parse.in#11 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/c-ppoutput.c#3 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/c-semantics.c#8 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/c-typeck.c#13 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/c.opt#2 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/calls.c#16 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cfglayout.c#4 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cfgrtl.c#8 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/collect2.c#11 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/combine.c#12 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/common.opt#2 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config.gcc#11 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config.in#10 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/alpha.c#10 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/alpha.h#10 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/alpha.md#10 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/qrnnd.asm#4 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/t-osf4#6 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm-protos.h#4 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm.c#7 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm.h#6 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm.md#7 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/t-netbsd#4 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/t-rtems#1 branch > .. //depot/projects/trustedbsd/base/contrib/gcc/config/darwin-protos.h#4 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/darwin.c#5 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/darwin.h#5 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/freebsd-spec.h#14 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/freebsd.h#7 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/cygwin1.c#2 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/darwin.h#3 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/emmintrin.h#3 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/freebsd.h#19 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/gthr-win32.c#4 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386-modes.def#3 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386-protos.h#8 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.c#12 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.h#12 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.md#10 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-rtems-i386#5 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xmmintrin.h#6 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/ia64.c#9 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/t-glibc#4 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/t-glibc-libunwind#1 branch > .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/t-hpux#6 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/unwind-ia64.c#8 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/unwind-ia64.h#5 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix.h#5 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix41.h#4 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix43.h#6 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix52.h#3 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/altivec.h#6 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/altivec.md#3 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/beos.h#4 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin.h#5 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/eabi.asm#4 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/freebsd.h#4 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/libgcc-ppc64.ver#2 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/linux-unwind.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/linux.h#6 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/linux64.h#8 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000-c.c#3 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000-protos.h#6 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.c#11 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.h#6 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.md#10 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rtems.h#6 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/spe.h#3 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/spe.md#3 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/sysv4.h#10 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-aix43#5 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-aix52#2 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-linux64#4 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-newas#3 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-rtems#2 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/s390.md#4 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/s390/tpf.h#2 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparc.c#13 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparc.md#11 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/t-elf#6 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-libunwind#3 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-libunwind-elf#1 branch > .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-slibgcc-darwin#2 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-slibgcc-elf-ver#7 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/config/t-slibgcc-sld#6 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/configure#12 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/configure.ac#2 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cp-demangle.c#7 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog#16 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cp/Make-lang.in#10 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cp/call.c#11 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cp/class.c#12 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cp-tree.h#14 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cvt.c#11 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cxx-pretty-print.c#2 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cp/decl.c#14 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cp/decl2.c#15 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cp/error.c#10 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cp/except.c#7 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cp/g++spec.c#8 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cp/init.c#15 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cp/mangle.c#9 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cp/method.c#11 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cp/name-lookup.c#2 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cp/parser.c#2 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cp/pt.c#14 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cp/search.c#12 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cp/semantics.c#10 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cp/tree.c#12 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cp/typeck.c#12 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cp/typeck2.c#11 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cppfiles.c#8 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cpplib.c#12 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cppmacro.c#11 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/crtstuff.c#8 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cse.c#11 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cselib.c#6 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/cselib.h#6 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/dbxout.c#11 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/defaults.h#9 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/doc/extend.texi#11 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/doc/include/gcc-common.texi#7 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/doc/invoke.texi#14 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/doc/md.texi#9 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/doc/tm.texi#11 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/doc/trouble.texi#6 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/dojump.c#2 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/dwarf2out.c#12 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/emit-rtl.c#14 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/explow.c#9 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/expmed.c#11 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/expr.c#15 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/expr.h#12 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/f/ChangeLog#15 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/f/bld.c#5 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/f/malloc.c#6 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/f/news.texi#10 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/flow.c#12 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/fold-const.c#12 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/function.c#13 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/gcc.c#16 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/gcov-io.h#7 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/gcse.c#9 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/ginclude/stddef.h#6 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/gthr-win32.h#6 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/hooks.c#6 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/hooks.h#6 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/ifcvt.c#8 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/jump.c#11 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/libgcc-darwin.ver#2 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/libgcc-std.ver#8 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/libgcc2.c#8 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/libgcc2.h#6 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/loop-unroll.c#2 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/loop.c#17 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/mkheaders.in#3 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/mklibgcc.in#10 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/objc/objc-act.c#8 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/params.def#6 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/params.h#6 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/postreload.c#2 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/predict.c#7 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/real.c#8 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/reg-stack.c#10 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/regclass.c#9 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/regrename.c#7 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/regs.h#7 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/reload.c#11 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/reload1.c#12 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/rtl.h#12 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/sibcall.c#8 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/simplify-rtx.c#7 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/target-def.h#5 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/target.h#5 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/toplev.c#14 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/tree-inline.c#8 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/tree.c#12 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/tree.h#13 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/unwind-compat.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/gcc/unwind-compat.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/gcc/unwind-dw2-fde-compat.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/gcc/unwind-dw2-fde-glibc.c#5 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/unwind-dw2.c#8 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/varasm.c#14 integrate > .. //depot/projects/trustedbsd/base/contrib/gcc/version.c#16 integrate > .. //depot/projects/trustedbsd/base/contrib/hostapd/COPYING#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/ChangeLog#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/FREEBSD-Xlist#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/FREEBSD-upgrade#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/Makefile#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/README#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/accounting.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/accounting.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/aes.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/aes_wrap.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/aes_wrap.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/ap.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/common.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/common.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/config.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/config.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/crypto.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/crypto.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/ctrl_iface.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/ctrl_iface.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/defconfig#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/defs.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/developer.txt#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/driver.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/driver_test.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/driver_wired.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/eap.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/eap.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_defs.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_gtc.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_i.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_identity.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_md5.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_mschapv2.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_peap.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim_common.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim_common.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim_db.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_sim_db.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_tls.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_tls_common.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_tls_common.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_tlv.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_ttls.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/eap_ttls.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/eapol_sm.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/eapol_sm.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/eloop.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/eloop.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/hostap_common.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.accept#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.conf#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.deny#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.eap_user#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.radius_clients#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.sim_db#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd.wpa_psk#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd_cli.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd_ctrl.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/hostapd_ctrl.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/iapp.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/iapp.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_11.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_11.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_11_auth.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_11_auth.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_1x.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/ieee802_1x.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/l2_packet.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/madwifi.conf#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/md5.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/md5.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/ms_funcs.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/ms_funcs.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/radius.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/radius.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/radius_client.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/radius_client.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/radius_server.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/radius_server.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/rc4.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/rc4.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/sha1.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/sha1.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/sta_info.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/sta_info.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/tls.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/tls_none.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/tls_openssl.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/version.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/wired.conf#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/wpa.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/hostapd/wpa.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/ipfilter/IPFILTER.LICENCE#4 delete > .. //depot/projects/trustedbsd/base/contrib/ipfilter/QNX_OCL.txt#2 delete > .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_fil_freebsd.c#2 delete > .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_htable.c#2 delete > .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_htable.h#2 delete > .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_irc_pxy.c#2 delete > .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_lookup.c#2 delete > .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_lookup.h#2 delete > .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_pool.c#2 delete > .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_pool.h#2 delete > .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_pptp_pxy.c#2 delete > .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_rpcb_pxy.c#2 delete > .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_scan.c#2 delete > .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_scan.h#2 delete > .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_sync.c#2 delete > .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_sync.h#2 delete > .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ipf_dotuning.c#2 integrate > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/FREEBSD-upgrade#11 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/LICENSE#2 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/Makefile#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/Makefile.conf#6 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/Makefile.dist#5 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/README#9 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/RELNOTES#9 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/Makefile.dist#5 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/clparse.c#8 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/dhclient-script.8#7 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/dhclient.8#7 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/dhclient.c#14 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/dhclient.conf#2 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/dhclient.conf.5#8 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/dhclient.leases.5#5 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/scripts/freebsd#7 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/Makefile.dist#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/alloc.c#5 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/bpf.c#6 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/comapi.c#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/conflex.c#6 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/ctrace.c#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/dhcp-eval.5#5 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/dhcp-options.5#7 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/discover.c#6 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/dispatch.c#7 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/dlpi.c#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/dns.c#5 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/ethernet.c#5 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/execute.c#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/fddi.c#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/icmp.c#5 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/inet.c#5 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/iscprint.c#2 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/lpf.c#5 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/memory.c#5 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/nit.c#5 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/options.c#7 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/packet.c#5 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/parse.c#7 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/print.c#8 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/raw.c#5 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/resolv.c#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/socket.c#5 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/tables.c#7 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/tr.c#5 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/tree.c#5 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/upf.c#5 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/configure#5 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/contrib/3.0b1-lease-convert#2 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/contrib/sethostname.sh#2 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dhcpctl/Makefile.dist#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dhcpctl/callback.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dhcpctl/cltest.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dhcpctl/dhcpctl.3#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dhcpctl/dhcpctl.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dhcpctl/dhcpctl.h#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dhcpctl/omshell.1#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dhcpctl/omshell.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dhcpctl/remote.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dst/Makefile.dist#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dst/base64.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dst/dst_api.c#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dst/dst_internal.h#2 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dst/dst_support.c#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dst/hmac_link.c#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dst/md5.h#2 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dst/md5_dgst.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dst/md5_locl.h#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/dst/prandom.c#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/arpa/nameser.h#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/arpa/nameser_compat.h#2 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/cdefs.h#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/cf/freebsd.h#6 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/ctrace.h#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/dhcp.h#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/dhcpd.h#11 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/dhctoken.h#5 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/failover.h#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/inet.h#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/isc-dhcp/boolean.h#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/isc-dhcp/dst.h#2 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/isc-dhcp/int.h#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/isc-dhcp/lang.h#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/isc-dhcp/list.h#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/isc-dhcp/result.h#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/isc-dhcp/types.h#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/minires/minires.h#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/minires/res_update.h#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/minires/resolv.h#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/netinet/if_ether.h#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/netinet/ip.h#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/netinet/ip_icmp.h#2 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/netinet/udp.h#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/omapip/alloc.h#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/omapip/buffer.h#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/omapip/convert.h#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/omapip/hash.h#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/omapip/omapip.h#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/omapip/omapip_p.h#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/omapip/trace.h#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/osdep.h#5 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/site.h#5 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/statement.h#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/tree.h#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/version.h#9 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/Makefile.dist#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/ns_date.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/ns_name.c#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/ns_parse.c#5 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/ns_samedomain.c#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/ns_sign.c#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/ns_verify.c#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/res_comp.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/res_findzonecut.c#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/res_init.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/res_mkquery.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/res_mkupdate.c#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/res_query.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/res_send.c#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/res_sendsigned.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/res_update.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/Makefile.dist#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/alloc.c#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/array.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/auth.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/buffer.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/connection.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/convert.c#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/dispatch.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/errwarn.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/generic.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/handle.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/hash.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/inet_addr.c#2 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/listener.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/message.c#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/mrtrace.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/omapi.3#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/protocol.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/result.c#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/support.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/test.c#4 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/toisc.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/omapip/trace.c#3 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/site.conf#2 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/tests/failover/dhcp-1.cf#2 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/tests/failover/dhcp-2.cf#2 delete > .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/tests/failover/new-failover#2 delete > .. //depot/projects/trustedbsd/base/contrib/libf2c/ChangeLog#12 integrate > .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/err.c#5 integrate > .. //depot/projects/trustedbsd/base/contrib/libobjc/ChangeLog#14 integrate > .. //depot/projects/trustedbsd/base/contrib/libobjc/gc.c#5 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/ChangeLog#15 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/ChangeLog-2004#1 branch > .. //depot/projects/trustedbsd/base/contrib/libstdc++/README#5 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/acconfig.h#8 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/acinclude.m4#11 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/aclocal.m4#11 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/config.h.in#9 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/alpha-linux-gnu/baseline_symbols.txt#2 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/arm-linux-gnu/baseline_symbols.txt#1 branch > .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/hppa-linux-gnu/baseline_symbols.txt#2 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/i386-linux-gnu/baseline_symbols.txt#1 branch > .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/i486-linux-gnu/baseline_symbols.txt#2 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/ia64-linux-gnu/baseline_symbols.txt#2 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/m68k-linux-gnu/baseline_symbols.txt#1 branch > .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/mips-linux-gnu/baseline_symbols.txt#2 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/powerpc-linux-gnu/baseline_symbols.txt#1 branch > .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/s390-linux-gnu/baseline_symbols.txt#1 branch > .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/s390x-linux-gnu/baseline_symbols.txt#1 branch > .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/sparc-linux-gnu/baseline_symbols.txt#2 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/x86_64-linux-gnu/32/baseline_symbols.txt#1 branch > .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/x86_64-linux-gnu/baseline_symbols.txt#3 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/io/basic_file_stdio.cc#4 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/io/c_io_stdio.h#3 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/linker-map.gnu#7 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/generic/c_locale.cc#6 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/generic/c_locale.h#6 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/generic/time_members.cc#6 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/gnu/c_locale.h#6 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/gnu/monetary_members.cc#7 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/gnu/time_members.cc#7 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/ieee_1003.1-2001/codecvt_specializations.h#5 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/configure#12 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/configure.ac#2 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/configure.host#6 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/crossconfig.m4#2 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/Makefile.am#9 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/Makefile.in#9 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/basic_string.h#7 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/basic_string.tcc#8 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/boost_concept_check.h#6 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/c++config#13 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/fstream.tcc#9 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/ios_base.h#7 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/istream.tcc#9 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/locale_facets.h#10 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/locale_facets.tcc#13 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/sstream.tcc#7 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/stl_algo.h#6 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/stl_algobase.h#5 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/stl_list.h#6 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/stl_tree.h#6 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/vector.tcc#3 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/debug/map.h#2 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/ext/pool_allocator.h#2 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/ext/rope#5 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/ext/ropeimpl.h#5 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/std/std_complex.h#4 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/std/std_fstream.h#6 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/std/std_memory.h#5 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/std/std_sstream.h#5 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/libsupc++/eh_globals.cc#5 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/linkage.m4#2 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/allocator.cc#2 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/debug.cc#2 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/ios.cc#8 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/ios_init.cc#2 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/locale_init.cc#2 integrate > .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/localename.cc#9 integrate > .. //depot/projects/trustedbsd/base/contrib/netcat/nc.1#2 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/CREDITS#11 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/HISTORY#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/MANIFEST#15 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/Makefile.am#3 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/Makefile.in#4 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/RELNOTES#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/aclocal.m4#3 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/autogen.sh#2 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/bin/Makefile.am#2 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/bin/Makefile.in#3 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/bin/su/Makefile.am#2 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/bin/su/Makefile.in#3 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/configure#4 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/Makefile.am#2 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/Makefile.in#3 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/Makefile.am#3 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/Makefile.in#3 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam.3#12 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_borrow_cred.3#15 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_free_data.3#15 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_free_envlist.3#2 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_get_option.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_log.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_nullconv.3#13 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_readline.3#5 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_restore_cred.3#15 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_set_option.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_ttyconv.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#20 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.conf.5#1 branch > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_acct_mgmt.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_authenticate.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_chauthtok.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_close_session.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_conv.3#7 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_end.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_error.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_authtok.3#19 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_data.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_item.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_user.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenv.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenvlist.3#19 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_info.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_open_session.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_prompt.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_putenv.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_data.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_item.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setcred.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setenv.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_authenticate.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_chauthtok.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_close_session.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_open_session.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_setcred.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_start.3#19 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_strerror.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_verror.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vinfo.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vprompt.3#18 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/include/Makefile.am#2 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/include/Makefile.in#3 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/Makefile.am#2 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/Makefile.in#3 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam_version.h#12 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/lib/Makefile.am#3 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/lib/Makefile.in#3 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dynamic.c#12 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_load.c#13 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_readline.c#2 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_ttyconv.c#19 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/ltmain.sh#4 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/misc/gendoc.pl#15 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/modules/Makefile.am#2 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/modules/Makefile.in#3 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_deny/Makefile.am#2 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_deny/Makefile.in#3 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_deny/pam_deny.c#11 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_permit/Makefile.am#2 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_permit/Makefile.in#3 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_unix/Makefile.am#2 integrate > .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_unix/Makefile.in#3 integrate > .. //depot/projects/trustedbsd/base/contrib/pnpinfo/pnpinfo.8#2 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/FREEBSD-upgrade#18 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/RELEASE_NOTES#15 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/README#14 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/submit.cf#14 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/version.m4#15 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/freebsd6.m4#1 branch > .. //depot/projects/trustedbsd/base/contrib/sendmail/doc/op/op.me#14 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/conf.h#13 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/sem.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/shm.h#6 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/Makefile.m4#5 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/ldap.c#10 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/sem.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/shm.c#6 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-sem.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-shm.c#7 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/src/README#14 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/src/TRACEFLAGS#9 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/src/collect.c#12 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/src/conf.c#16 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/src/daemon.c#13 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/src/deliver.c#15 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/src/domain.c#11 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/src/envelope.c#8 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/src/map.c#12 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/src/mci.c#12 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/src/milter.c#15 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/src/parseaddr.c#14 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/src/queue.c#15 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sendmail.h#15 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/src/srvrsmtp.c#15 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/src/tls.c#11 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/src/usersmtp.c#12 integrate > .. //depot/projects/trustedbsd/base/contrib/sendmail/src/version.c#15 integrate > .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-bgp.c#7 integrate > .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-isoclns.c#7 integrate > .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-rsvp.c#4 integrate > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/COPYING#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ChangeLog#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/FREEBSD-Xlist#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/FREEBSD-upgrade#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/Makefile#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/README#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/aes.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/aes_wrap.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/aes_wrap.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/common.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/common.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/config.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/config.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/config_ssid.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/crypto.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/crypto.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ctrl_iface.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ctrl_iface.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/defconfig#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/defs.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/developer.txt#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/doc/wpa_supplicant.fig#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/driver.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/drivers.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_aka.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_defs.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_fast.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_gtc.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_i.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_leap.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_md5.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_mschapv2.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_otp.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_peap.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_psk.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_sim.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_sim_common.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_sim_common.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_testing.txt#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_tls.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_tls_common.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_tls_common.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_tlv.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_tlv.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_ttls.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eap_ttls.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eapol_sm.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eapol_sm.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eapol_test.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eloop.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/eloop.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/hostap_common.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/l2_packet.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/md5.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/md5.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ms_funcs.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/ms_funcs.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/openssl-tls-extensions.patch#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/pcsc_funcs.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/pcsc_funcs.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/preauth_test.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/radius.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/radius.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/radius_client.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/radius_client.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/rc4.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/rc4.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/sha1.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/sha1.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tls.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tls_none.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/tls_openssl.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/todo.txt#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/version.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_cli.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_ctrl.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_ctrl.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_passphrase.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_supplicant.c#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_supplicant.conf#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_supplicant.h#1 branch > .. //depot/projects/trustedbsd/base/contrib/wpa_supplicant/wpa_supplicant_i.h#1 branch > .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/su/Makefile.am#3 integrate > .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/su/su.c#7 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/ChangeLog#10 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/FREEBSD-tricks#4 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/FREEBSD-upgrade#8 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/INSTALL#7 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/LICENCE#6 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/Makefile.in#8 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/README#9 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/README.platform#3 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/README.privsep#7 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/TODO#7 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/WARNING.RNG#3 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/acconfig.h#11 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/audit-bsm.c#1 branch > .. //depot/projects/trustedbsd/base/crypto/openssh/audit.c#1 branch > .. //depot/projects/trustedbsd/base/crypto/openssh/audit.h#1 branch > .. //depot/projects/trustedbsd/base/crypto/openssh/auth-bsdauth.c#4 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/auth-chall.c#8 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/auth-krb5.c#12 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/auth-options.c#6 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/auth-pam.c#11 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/auth-pam.h#10 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/auth-passwd.c#12 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/auth-rsa.c#7 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/auth-shadow.c#2 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/auth-sia.c#7 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/auth-sia.h#6 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/auth.c#10 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/auth.h#12 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/auth1.c#12 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-chall.c#8 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-kbdint.c#3 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-none.c#5 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-passwd.c#4 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-pubkey.c#5 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/auth2.c#14 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/authfile.c#10 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/bufaux.c#8 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/bufaux.h#6 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/buffer.c#7 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/buffer.h#3 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/buildpkg.sh.in#2 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/canohost.c#11 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/canohost.h#3 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/channels.c#13 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/channels.h#9 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/cipher-ctr.c#3 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/cipher.c#10 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/clientloop.c#10 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/clientloop.h#6 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/compat.c#8 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/compat.h#9 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/config.guess#6 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/config.h#9 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/configure.ac#10 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/defines.h#10 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/hostfile.c#8 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/hostfile.h#6 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/includes.h#10 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/key.c#10 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/log.c#9 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/loginrec.c#10 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/loginrec.h#3 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/misc.c#9 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/misc.h#6 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/moduli#3 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/moduli.c#4 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/monitor.c#12 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/monitor.h#6 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_mm.c#6 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_wrap.c#10 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_wrap.h#9 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-arc4random.c#6 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-cray.c#5 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-cray.h#6 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#6 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#3 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-misc.c#7 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-misc.h#8 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-openpty.c#2 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/bsd-snprintf.c#4 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/fake-rfc2553.h#6 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/getrrsetbyname.c#4 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/inet_ntop.c#5 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/mktemp.c#6 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-aix.c#6 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/port-aix.h#7 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/readpassphrase.c#5 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/realpath.c#5 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/xmmap.c#4 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/packet.c#11 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/readconf.c#13 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/readconf.h#10 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/readpass.c#6 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/regress/Makefile#8 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/regress/agent-ptrace.sh#4 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/regress/brokenkeys.sh#1 branch > .. //depot/projects/trustedbsd/base/crypto/openssh/regress/dynamic-forward.sh#5 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/regress/envpass.sh#2 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/regress/login-timeout.sh#4 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/regress/multiplex.sh#2 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/regress/reexec.sh#2 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/regress/rekey.sh#2 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/regress/scp.sh#2 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/regress/sftp-glob.sh#1 branch > .. //depot/projects/trustedbsd/base/crypto/openssh/regress/sshd-log-wrapper.sh#1 branch > .. //depot/projects/trustedbsd/base/crypto/openssh/regress/test-exec.sh#7 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/scp.1#11 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/scp.c#9 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/servconf.c#13 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/servconf.h#8 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/session.c#22 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-client.c#12 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-client.h#6 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/sftp.1#11 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/sftp.c#12 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-add.1#7 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-add.c#9 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-agent.c#14 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keygen.1#8 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keygen.c#10 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keyscan.1#6 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keyscan.c#11 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keysign.c#7 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-rand-helper.c#7 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.1#12 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.c#13 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.h#9 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/ssh1.h#4 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config#17 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config.5#13 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/sshconnect.c#10 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/sshd.8#12 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/sshd.c#15 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config#18 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config.5#15 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/survey.sh.in#1 branch > .. //depot/projects/trustedbsd/base/crypto/openssh/uidswap.c#7 integrate > .. //depot/projects/trustedbsd/base/crypto/openssh/version.h#17 integrate > .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#45 integrate > .. //depot/projects/trustedbsd/base/etc/devd.conf#16 integrate > .. //depot/projects/trustedbsd/base/etc/etc.sparc64/ttys#9 integrate > .. //depot/projects/trustedbsd/base/etc/ftpusers#9 integrate > .. //depot/projects/trustedbsd/base/etc/group#9 integrate > .. //depot/projects/trustedbsd/base/etc/inetd.conf#15 integrate > .. //depot/projects/trustedbsd/base/etc/mail/aliases#10 integrate > .. //depot/projects/trustedbsd/base/etc/master.passwd#11 integrate > .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#30 integrate > .. //depot/projects/trustedbsd/base/etc/mtree/BSD.local.dist#30 integrate > .. //depot/projects/trustedbsd/base/etc/mtree/BSD.root.dist#11 integrate > > >>> TRUNCATED FOR MAIL (1000 lines) <<< -- Christian S.J. Peron csjp@FreeBSD.ORG FreeBSD Committer From owner-p4-projects@FreeBSD.ORG Sun Jul 10 15:51:59 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8503D16A420; Sun, 10 Jul 2005 15:51:58 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3213316A41C for ; Sun, 10 Jul 2005 15:51:58 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BFBFC43D48 for ; Sun, 10 Jul 2005 15:51:57 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6AFpv7P088563 for ; Sun, 10 Jul 2005 15:51:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6AFpbwb088557 for perforce@freebsd.org; Sun, 10 Jul 2005 15:51:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 10 Jul 2005 15:51:37 GMT Message-Id: <200507101551.j6AFpbwb088557@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 79924 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 15:51:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=79924 Change 79924 by rwatson@rwatson_zoo on 2005/07/10 15:50:56 Integrate trustedbsd_mac: - MAINTAINERS policy - distribute32 target - amd update - gcc update - bzip-related security fixes - various ipfilter updates - OpenPAM Figwort - sendmail update - tcpdump fixes - OpenSSH update - OpenBSD dhclient - Yet more HWPMC - less rexecd - wpa_supplicant - fortunes - libarchive time work, flags portability. - i386_set_gsbase() - preadv()/pwritev() - Kqueue file system restructuring - ELF format system cores for additional architectures - libthr.3 man page, libthr fixen - ggate protocol and implementation retrofit - if_bridge, stp - linux_getpriority() - Much cleanup of emulation system call paths -- kern_getfsstat(), MPSAFE flag propagation, MPSAFE SMP handling, MPSAFE network stack handling, etc. - IPI_PREEMPTION - M_DEVBUF instances modified to make debugging memory leaks easier. - cleaner freebsd32 kevent emulation for freebsd64 - svr4 emulation cleanup - ng_tcpmss - src/sys/gnu/fs rename. - COMPAT_FEEBSD5 - if_alloc()/if_free() now dynamically allocate and free ifnet structures separately from softc, so lots of adaptationn. Likewise, ifnet type data is now allocated and freed. - The normal set of device IDs, etc. - Many sundry device driver changes, untold numbers of them to do with changes in the relationship between network interface device driver softc structures and ifnet structures. - support for debugging i386 processes on amd64 - Loop-back of audit event ID insertion into additional ibcs2-related system call vectors. - Allow kqueue locking to know about things other than mutexes protecting event queues, so that vnode lock can be used to protect vnode event queues. - Prison support for further restricting the set of visible file systems in jail. - curthread pointer in KTR. - p_cansee() in ktrace(). - Mbuf wrapper around UMA now does memory trashing and checking. - Less Giant in kernel resource limit code. - Sched_ule fixen for threading and preemption. - Improved real-time clock locking. - Loop back of mac_.*sysv_sema() -> mac_.*syv_sem() rename. - Loop back of mac_check_socket_create(). - KTR_VFS - Locking pre and post-conditions in VFS now more cleanly handled, with KEVENT/etc happening in the VOP wrappers. - bridge alignment check and fix. - Loop back of mac_copy_mbuf() replacing mac_create_mbuf_from_mbuf(). - 802.11 learns about forcing. - netinet/in.c and netinet6/in6.c use IFF_LOCKGIANT() around if_ioctls. - inpcb and TCP/UDP locking assertions and fixes to do wih tear-down, de-spl'ing of UDP. - Continued libalias kernel adaptation. - TCP SACK bugfixes and optimizations. - Locking for so_emuldata - VA_EXECVE_ATIME -- update access time for execution events on vnode. - UMA_BOOT_PAGES expanded. Affected files ... .. //depot/projects/trustedbsd/mac/LOCKS#1 branch .. //depot/projects/trustedbsd/mac/MAINTAINERS#27 integrate .. //depot/projects/trustedbsd/mac/Makefile#34 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#57 integrate .. //depot/projects/trustedbsd/mac/UPDATING#48 integrate .. //depot/projects/trustedbsd/mac/bin/chflags/chflags.1#8 integrate .. //depot/projects/trustedbsd/mac/bin/dd/dd.1#11 integrate .. //depot/projects/trustedbsd/mac/bin/ls/cmp.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/ls/extern.h#11 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.1#27 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.c#32 integrate .. //depot/projects/trustedbsd/mac/bin/ls/util.c#15 integrate .. //depot/projects/trustedbsd/mac/bin/rmail/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/bin/rmdir/rmdir.1#7 integrate .. //depot/projects/trustedbsd/mac/bin/sh/expand.c#14 integrate .. //depot/projects/trustedbsd/mac/bin/sh/sh.1#20 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amd/amd.8#6 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amq/amq.8#6 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amq/pawd.1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fixmount/fixmount.8#7 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/fsinfo/fsinfo.8#8 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/hlfsd.8#7 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/mk-amd-map/mk-amd-map.8#5 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/scripts/amd.conf.5#7 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/wire-test/wire-test.8#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/sparc-opc.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bzip2/bzip2.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/com_err/compile_et.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/diff/diff.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ChangeLog#15 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/Makefile.in#13 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/attribs.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/builtins.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-common.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-decl.c#14 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-format.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-opts.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-parse.in#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-ppoutput.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-semantics.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-typeck.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c.opt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/calls.c#15 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cfglayout.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cfgrtl.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/collect2.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/combine.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/common.opt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config.gcc#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config.in#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/alpha.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/alpha.h#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/alpha.md#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/qrnnd.asm#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/t-osf4#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/arm-protos.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/arm.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/arm.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/arm.md#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/t-netbsd#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/t-rtems#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/darwin-protos.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/darwin.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/darwin.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/freebsd-spec.h#12 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/freebsd.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/cygwin1.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/darwin.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/emmintrin.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/freebsd.h#18 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/gthr-win32.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386-modes.def#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386-protos.h#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386.h#12 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386.md#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/t-rtems-i386#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/xmmintrin.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/ia64.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/t-glibc#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/t-glibc-libunwind#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/t-hpux#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/unwind-ia64.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/unwind-ia64.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/aix.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/aix41.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/aix43.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/aix52.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/altivec.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/altivec.md#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/beos.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/darwin.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/eabi.asm#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/freebsd.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/libgcc-ppc64.ver#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/linux-unwind.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/linux.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/linux64.h#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rs6000-c.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rs6000-protos.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rs6000.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rs6000.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rs6000.md#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rtems.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/spe.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/spe.md#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/sysv4.h#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/t-aix43#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/t-aix52#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/t-linux64#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/t-newas#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/t-rtems#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/s390/s390.md#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/s390/tpf.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sparc.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sparc.md#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/t-elf#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/t-libunwind#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/t-libunwind-elf#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/t-slibgcc-darwin#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/t-slibgcc-elf-ver#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/t-slibgcc-sld#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/configure#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/configure.ac#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp-demangle.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/ChangeLog#15 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/Make-lang.in#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/call.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/class.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/cp-tree.h#14 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/cvt.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/cxx-pretty-print.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/decl.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/decl2.c#14 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/error.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/except.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/g++spec.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/init.c#14 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/mangle.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/method.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/name-lookup.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/parser.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/pt.c#14 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/search.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/semantics.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/tree.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/typeck.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/typeck2.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cppfiles.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cpplib.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cppmacro.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/crtstuff.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cse.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cselib.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cselib.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/dbxout.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/defaults.h#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/extend.texi#12 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/include/gcc-common.texi#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/invoke.texi#14 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/md.texi#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/tm.texi#12 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/trouble.texi#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/dojump.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/dwarf2out.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/emit-rtl.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/explow.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/expmed.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/expr.c#14 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/expr.h#12 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/ChangeLog#14 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/bld.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/malloc.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/news.texi#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/flow.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/fold-const.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/function.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gcc.c#15 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gcov-io.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gcse.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/stddef.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gthr-win32.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/hooks.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/hooks.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ifcvt.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/jump.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/libgcc-darwin.ver#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/libgcc-std.ver#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/libgcc2.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/libgcc2.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/loop-unroll.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/loop.c#15 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/mkheaders.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/mklibgcc.in#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/objc/objc-act.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/params.def#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/params.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/postreload.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/predict.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/real.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/reg-stack.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/regclass.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/regrename.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/regs.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/reload.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/reload1.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/rtl.h#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/sibcall.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/simplify-rtx.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/target-def.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/target.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/toplev.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tree-inline.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tree.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tree.h#12 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/unwind-compat.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/unwind-compat.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/unwind-dw2-fde-compat.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/unwind-dw2-fde-glibc.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/unwind-dw2.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/varasm.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/version.c#15 integrate .. //depot/projects/trustedbsd/mac/contrib/hostapd/COPYING#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/ChangeLog#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/Makefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/README#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/accounting.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/accounting.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/aes.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/aes_wrap.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/aes_wrap.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/ap.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/common.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/common.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/config.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/config.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/crypto.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/crypto.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/ctrl_iface.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/ctrl_iface.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/defconfig#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/defs.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/developer.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/driver.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/driver_test.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/driver_wired.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_defs.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_gtc.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_i.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_identity.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_md5.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_mschapv2.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_peap.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_sim.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_sim_common.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_sim_common.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_sim_db.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_sim_db.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_tls.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_tls_common.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_tls_common.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_tlv.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_ttls.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eap_ttls.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eapol_sm.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eapol_sm.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eloop.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/eloop.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostap_common.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd.accept#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd.conf#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd.deny#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd.eap_user#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd.radius_clients#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd.sim_db#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd.wpa_psk#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd_cli.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd_ctrl.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/hostapd_ctrl.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/iapp.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/iapp.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/ieee802_11.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/ieee802_11.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/ieee802_11_auth.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/ieee802_11_auth.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/ieee802_1x.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/ieee802_1x.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/l2_packet.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/madwifi.conf#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/md5.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/md5.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/ms_funcs.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/ms_funcs.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/radius.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/radius.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/radius_client.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/radius_client.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/radius_server.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/radius_server.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/rc4.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/rc4.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/sha1.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/sha1.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/sta_info.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/sta_info.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/tls.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/tls_none.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/tls_openssl.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/version.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/wired.conf#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/wpa.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/hostapd/wpa.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/ipfilter/IPFILTER.LICENCE#5 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/QNX_OCL.txt#3 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_fil_freebsd.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_htable.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_htable.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_irc_pxy.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_lookup.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_lookup.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_pool.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_pool.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_pptp_pxy.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_rpcb_pxy.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_scan.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_scan.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_sync.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_sync.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/lib/ipf_dotuning.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/FREEBSD-upgrade#10 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/LICENSE#2 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/Makefile#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/Makefile.conf#7 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/Makefile.dist#6 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/README#9 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/RELNOTES#9 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/Makefile.dist#6 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/clparse.c#9 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/dhclient-script.8#8 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/dhclient.8#8 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/dhclient.c#13 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/dhclient.conf#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/dhclient.conf.5#9 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/dhclient.leases.5#6 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/scripts/freebsd#8 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/Makefile.dist#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/alloc.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/bpf.c#7 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/comapi.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/conflex.c#7 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/ctrace.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/dhcp-eval.5#6 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/dhcp-options.5#8 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/discover.c#7 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/dispatch.c#8 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/dlpi.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/dns.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/ethernet.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/execute.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/fddi.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/icmp.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/inet.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/iscprint.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/lpf.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/memory.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/nit.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/options.c#8 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/packet.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/parse.c#8 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/print.c#9 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/raw.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/resolv.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/socket.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/tables.c#8 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/tr.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/tree.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/upf.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/configure#6 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/contrib/3.0b1-lease-convert#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/contrib/sethostname.sh#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/dhcpctl/Makefile.dist#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/dhcpctl/callback.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/dhcpctl/cltest.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/dhcpctl/dhcpctl.3#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/dhcpctl/dhcpctl.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/dhcpctl/dhcpctl.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/dhcpctl/omshell.1#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/dhcpctl/omshell.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/dhcpctl/remote.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/dst/Makefile.dist#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/dst/base64.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/dst/dst_api.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/dst/dst_internal.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/dst/dst_support.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/dst/hmac_link.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/dst/md5.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/dst/md5_dgst.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/dst/md5_locl.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/dst/prandom.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/arpa/nameser.h#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/arpa/nameser_compat.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/cdefs.h#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/cf/freebsd.h#7 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/ctrace.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/dhcp.h#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/dhcpd.h#11 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/dhctoken.h#6 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/failover.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/inet.h#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/isc-dhcp/boolean.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/isc-dhcp/dst.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/isc-dhcp/int.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/isc-dhcp/lang.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/isc-dhcp/list.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/isc-dhcp/result.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/isc-dhcp/types.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/minires/minires.h#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/minires/res_update.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/minires/resolv.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/netinet/if_ether.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/netinet/ip.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/netinet/ip_icmp.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/netinet/udp.h#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/omapip/alloc.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/omapip/buffer.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/omapip/convert.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/omapip/hash.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/omapip/omapip.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/omapip/omapip_p.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/omapip/trace.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/osdep.h#6 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/site.h#6 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/statement.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/tree.h#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/version.h#9 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/minires/Makefile.dist#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/minires/ns_date.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/minires/ns_name.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/minires/ns_parse.c#6 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/minires/ns_samedomain.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/minires/ns_sign.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/minires/ns_verify.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/minires/res_comp.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/minires/res_findzonecut.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/minires/res_init.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/minires/res_mkquery.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/minires/res_mkupdate.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/minires/res_query.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/minires/res_send.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/minires/res_sendsigned.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/minires/res_update.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/Makefile.dist#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/alloc.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/array.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/auth.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/buffer.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/connection.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/convert.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/dispatch.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/errwarn.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/generic.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/handle.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/hash.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/inet_addr.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/listener.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/message.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/mrtrace.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/omapi.3#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/protocol.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/result.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/support.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/test.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/toisc.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/omapip/trace.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/site.conf#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/tests/failover/dhcp-1.cf#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/tests/failover/dhcp-2.cf#3 delete .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/tests/failover/new-failover#3 delete .. //depot/projects/trustedbsd/mac/contrib/libf2c/ChangeLog#12 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/err.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libobjc/ChangeLog#13 integrate .. //depot/projects/trustedbsd/mac/contrib/libobjc/gc.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/ChangeLog#14 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/ChangeLog-2004#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/README#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/acconfig.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/acinclude.m4#11 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/aclocal.m4#11 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config.h.in#9 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/alpha-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/arm-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/hppa-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/i386-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/i486-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/ia64-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/m68k-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/mips-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/powerpc-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/s390-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/s390x-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/sparc-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/x86_64-linux-gnu/32/baseline_symbols.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/x86_64-linux-gnu/baseline_symbols.txt#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/io/basic_file_stdio.cc#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/io/c_io_stdio.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/linker-map.gnu#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/locale/generic/c_locale.cc#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/locale/generic/c_locale.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/locale/generic/time_members.cc#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/locale/gnu/c_locale.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/locale/gnu/monetary_members.cc#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/locale/gnu/time_members.cc#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/locale/ieee_1003.1-2001/codecvt_specializations.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/configure#12 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/configure.ac#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/configure.host#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/crossconfig.m4#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/Makefile.am#10 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/Makefile.in#10 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/basic_string.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/basic_string.tcc#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/boost_concept_check.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/c++config#13 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/fstream.tcc#9 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/ios_base.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/istream.tcc#9 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/locale_facets.h#10 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/locale_facets.tcc#13 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/sstream.tcc#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/stl_algo.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/stl_algobase.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/stl_list.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/stl_tree.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/vector.tcc#3 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/debug/map.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/ext/pool_allocator.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/ext/rope#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/ext/ropeimpl.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/std/std_complex.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/std/std_fstream.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/std/std_memory.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/std/std_sstream.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/libsupc++/eh_globals.cc#6 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/linkage.m4#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/allocator.cc#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/debug.cc#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/ios.cc#8 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/ios_init.cc#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/locale_init.cc#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/localename.cc#9 integrate .. //depot/projects/trustedbsd/mac/contrib/netcat/nc.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/CREDITS#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/HISTORY#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/MANIFEST#15 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/Makefile.am#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/RELNOTES#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/aclocal.m4#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/autogen.sh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/bin/Makefile.am#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/bin/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/bin/su/Makefile.am#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/bin/su/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/configure#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/Makefile.am#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/Makefile.am#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_borrow_cred.3#15 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_free_data.3#15 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_free_envlist.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_get_option.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_log.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_nullconv.3#13 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_readline.3#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_restore_cred.3#15 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_set_option.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_ttyconv.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam.conf.5#1 branch .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_acct_mgmt.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_authenticate.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_chauthtok.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_close_session.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_conv.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_end.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_error.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_authtok.3#19 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_data.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_item.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_user.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenv.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenvlist.3#19 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_info.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_open_session.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_prompt.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_putenv.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_data.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_item.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setcred.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setenv.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_authenticate.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_chauthtok.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_close_session.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_open_session.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_setcred.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_start.3#19 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_strerror.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_verror.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vinfo.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vprompt.3#18 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/Makefile.am#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/Makefile.am#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/openpam_version.h#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/Makefile.am#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_dynamic.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_load.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_readline.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_ttyconv.c#20 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/ltmain.sh#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/misc/gendoc.pl#15 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/Makefile.am#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_deny/Makefile.am#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_deny/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_deny/pam_deny.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_permit/Makefile.am#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_permit/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_unix/Makefile.am#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_unix/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/pnpinfo/pnpinfo.8#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/FREEBSD-upgrade#17 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/RELEASE_NOTES#15 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/README#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/submit.cf#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/version.m4#15 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/freebsd6.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/doc/op/op.me#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/conf.h#13 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/sem.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/shm.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/Makefile.m4#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/ldap.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/sem.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/shm.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-sem.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-shm.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/README#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/TRACEFLAGS#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/collect.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/conf.c#16 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/daemon.c#13 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/deliver.c#19 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/domain.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/envelope.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/map.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/mci.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/milter.c#15 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/parseaddr.c#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/queue.c#15 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sendmail.h#15 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/srvrsmtp.c#15 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/tls.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/usersmtp.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/version.c#15 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-bgp.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-isoclns.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tcpdump/print-rsvp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/COPYING#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/ChangeLog#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/Makefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/README#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/aes.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/aes_wrap.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/aes_wrap.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/common.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/common.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/config.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/config.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/config_ssid.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/crypto.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/crypto.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/ctrl_iface.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/ctrl_iface.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/defconfig#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/defs.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/developer.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/doc/wpa_supplicant.fig#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/driver.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/drivers.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_aka.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_defs.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_fast.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_gtc.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_i.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_leap.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_md5.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_mschapv2.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_otp.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_peap.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_psk.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_sim.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_sim_common.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_sim_common.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_testing.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_tls.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_tls_common.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_tls_common.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_tlv.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_tlv.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_ttls.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eap_ttls.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eapol_sm.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eapol_sm.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eapol_test.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eloop.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/eloop.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/hostap_common.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/l2_packet.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/md5.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/md5.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/ms_funcs.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/ms_funcs.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/openssl-tls-extensions.patch#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/pcsc_funcs.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/pcsc_funcs.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/preauth_test.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/radius.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/radius.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/radius_client.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/radius_client.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/rc4.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/rc4.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/sha1.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/sha1.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/tls.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/tls_none.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/tls_openssl.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/todo.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/version.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_cli.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_ctrl.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_ctrl.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_passphrase.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_supplicant.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_supplicant.conf#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_supplicant.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/wpa_supplicant/wpa_supplicant_i.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/su/Makefile.am#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/su/su.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ChangeLog#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/FREEBSD-tricks#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/FREEBSD-upgrade#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/INSTALL#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/LICENCE#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/Makefile.in#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/README#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/README.platform#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/README.privsep#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/TODO#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/WARNING.RNG#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/acconfig.h#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/audit-bsm.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/audit.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/audit.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-bsdauth.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-chall.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-krb5.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-options.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-pam.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-pam.h#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-passwd.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-rsa.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-shadow.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-sia.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-sia.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth.h#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth1.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-chall.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-kbdint.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-none.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-passwd.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-pubkey.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2.c#13 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/authfile.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/bufaux.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/bufaux.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/buffer.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/buffer.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/buildpkg.sh.in#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/canohost.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/canohost.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/channels.c#13 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/channels.h#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/cipher-ctr.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/cipher.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/clientloop.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/clientloop.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/compat.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/compat.h#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/config.guess#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/config.h#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/configure.ac#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/defines.h#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/hostfile.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/hostfile.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/includes.h#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/key.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/log.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/loginrec.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/loginrec.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/misc.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/misc.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/moduli#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/moduli.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_mm.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_wrap.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_wrap.h#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-arc4random.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-cray.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-cray.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-misc.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-misc.h#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-openpty.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-snprintf.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/fake-rfc2553.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/getrrsetbyname.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/inet_ntop.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/mktemp.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/port-aix.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/port-aix.h#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/readpassphrase.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/realpath.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/xmmap.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/packet.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/readconf.c#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/readconf.h#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/readpass.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/agent-ptrace.sh#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/brokenkeys.sh#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/dynamic-forward.sh#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/envpass.sh#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/login-timeout.sh#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/multiplex.sh#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/reexec.sh#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/rekey.sh#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/scp.sh#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/sftp-glob.sh#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/sshd-log-wrapper.sh#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/regress/test-exec.sh#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/scp.1#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/scp.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/servconf.c#13 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/servconf.h#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/session.c#22 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-client.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp-client.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp.1#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sftp.c#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-add.1#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-add.c#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-agent.c#13 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keygen.1#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keygen.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keyscan.1#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keyscan.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-keysign.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh-rand-helper.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh.1#11 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh.c#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh.h#9 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh1.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config#16 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config.5#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect.c#10 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd.8#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd.c#14 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config#17 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config.5#14 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/survey.sh.in#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/uidswap.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/version.h#16 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#41 integrate .. //depot/projects/trustedbsd/mac/etc/devd.conf#14 integrate .. //depot/projects/trustedbsd/mac/etc/etc.sparc64/ttys#9 integrate .. //depot/projects/trustedbsd/mac/etc/ftpusers#9 integrate .. //depot/projects/trustedbsd/mac/etc/group#9 integrate .. //depot/projects/trustedbsd/mac/etc/inetd.conf#14 integrate .. //depot/projects/trustedbsd/mac/etc/mail/aliases#10 integrate .. //depot/projects/trustedbsd/mac/etc/master.passwd#9 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#36 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.local.dist#26 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.root.dist#13 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jul 10 15:54:01 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 233D416A421; Sun, 10 Jul 2005 15:54:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EF3CB16A41C for ; Sun, 10 Jul 2005 15:54:00 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF18E43D48 for ; Sun, 10 Jul 2005 15:54:00 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6AFs0b8090226 for ; Sun, 10 Jul 2005 15:54:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6AFs0dV090214 for perforce@freebsd.org; Sun, 10 Jul 2005 15:54:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 10 Jul 2005 15:54:00 GMT Message-Id: <200507101554.j6AFs0dV090214@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 79925 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 15:54:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=79925 Change 79925 by rwatson@rwatson_zoo on 2005/07/10 15:53:52 Only include SEBSD pieces if SEBSD is being built. Affected files ... .. //depot/projects/trustedbsd/sebsd/usr.bin/login/login.c#10 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/usr.bin/login/login.c#10 (text+ko) ==== @@ -68,7 +68,9 @@ #include #include #include +#ifdef SEBSD #include +#endif #include #include #include @@ -78,10 +80,12 @@ #include #include +#ifdef SEBSD #include #include #include #include +#endif #include "login.h" #include "pathnames.h" From owner-p4-projects@FreeBSD.ORG Sun Jul 10 17:30:44 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 979D316A420; Sun, 10 Jul 2005 17:30:43 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 66EEA16A41C for ; Sun, 10 Jul 2005 17:30:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E980D43D48 for ; Sun, 10 Jul 2005 17:30:42 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6AHUgIX017922 for ; Sun, 10 Jul 2005 17:30:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6AHUgJQ017919 for perforce@freebsd.org; Sun, 10 Jul 2005 17:30:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 10 Jul 2005 17:30:42 GMT Message-Id: <200507101730.j6AHUgJQ017919@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 79933 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 17:30:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=79933 Change 79933 by rwatson@rwatson_zoo on 2005/07/10 17:29:47 Reduce gratuitous white space difference from CVS. Affected files ... .. //depot/projects/trustedbsd/mac/etc/mac.conf#13 edit Differences ... ==== //depot/projects/trustedbsd/mac/etc/mac.conf#13 (text+ko) ==== @@ -15,3 +15,4 @@ default_labels ifnet ?biba,?lomac,?mls,?sebsd default_labels process ?biba,?lomac,?mls,?partition,?sebsd default_labels socket ?biba,?lomac,?mls + From owner-p4-projects@FreeBSD.ORG Sun Jul 10 18:07:29 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC91616A420; Sun, 10 Jul 2005 18:07:28 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA67E16A41C for ; Sun, 10 Jul 2005 18:07:28 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5017943D45 for ; Sun, 10 Jul 2005 18:07:28 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6AI7S9R019580 for ; Sun, 10 Jul 2005 18:07:28 GMT (envelope-from soc-victor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6AI7S0M019577 for perforce@freebsd.org; Sun, 10 Jul 2005 18:07:28 GMT (envelope-from soc-victor@freebsd.org) Date: Sun, 10 Jul 2005 18:07:28 GMT Message-Id: <200507101807.j6AI7S0M019577@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-victor@freebsd.org using -f From: soc-victor To: Perforce Change Reviews Cc: Subject: PERFORCE change 79935 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 18:07:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=79935 Change 79935 by soc-victor@soc-victor_82.76.158.176 on 2005/07/10 18:06:47 Added the boiler-plate code for the HOST-RESOURCES-MIB module. First ( partial ) implementation for the HOST-RESOURCES-MIB's scalars: only SNMP GET operation is supported; also HOST-RESOURCES-MIB::hrSystemInitialLoadDevice is not implemented as it depends on a SNMP table which is not implemented yet. Affected files ... .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/Makefile#3 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#2 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#1 add .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#1 add .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#1 add Differences ... ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/Makefile#3 (text+ko) ==== @@ -7,10 +7,10 @@ .endif SUBDIR= ${_snmp_atm} \ + snmp_hostres \ snmp_mibII \ snmp_netgraph \ - snmp_pf \ - snmp_hostres + snmp_pf INCS= snmpmod.h INCSDIR= ${INCLUDEDIR}/bsnmp ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#2 (text+ko) ==== @@ -6,9 +6,9 @@ CONTRIB=${.CURDIR}/../../../../contrib/bsnmp MOD= hostres -SRCS= +SRCS= hostres_snmp.c hostres_scalars.c WARNS?= 6 - +CFLAGS+= -DNDEBUG XSYM= host hrStorageOther hrStorageRam hrStorageVirtualMemory \ hrStorageFixedDisk hrStorageRemovableDisk hrStorageFloppyDisk \ hrStorageCompactDisc hrStorageRamDisk hrStorageFlashMemory \ @@ -26,5 +26,5 @@ DEFS= ${MOD}_tree.def BMIBS= HOST-RESOURCES-MIB.txt HOST-RESOURCES-TYPES.txt - +LDADD= -lkvm .include From owner-p4-projects@FreeBSD.ORG Sun Jul 10 20:31:21 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B58F16A420; Sun, 10 Jul 2005 20:31:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 20BDD16A41C for ; Sun, 10 Jul 2005 20:31:21 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DECC743D58 for ; Sun, 10 Jul 2005 20:31:20 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6AKVKcI025655 for ; Sun, 10 Jul 2005 20:31:20 GMT (envelope-from soc-victor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6AKVKT3025652 for perforce@freebsd.org; Sun, 10 Jul 2005 20:31:20 GMT (envelope-from soc-victor@freebsd.org) Date: Sun, 10 Jul 2005 20:31:20 GMT Message-Id: <200507102031.j6AKVKT3025652@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-victor@freebsd.org using -f From: soc-victor To: Perforce Change Reviews Cc: Subject: PERFORCE change 79936 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 20:31:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=79936 Change 79936 by soc-victor@soc-victor_82.76.158.176 on 2005/07/10 20:30:56 Cosmetic changes in the gensnmptree tool so as the _tree.h generated/ output file to contain the #ifndef...#define... #endif clauses in order to prevent multiple inclusions. Affected files ... .. //depot/projects/soc2005/bsnmp/contrib/bsnmp/gensnmptree/gensnmptree.c#2 edit Differences ... ==== //depot/projects/soc2005/bsnmp/contrib/bsnmp/gensnmptree/gensnmptree.c#2 (text+ko) ==== @@ -898,6 +898,8 @@ int opt; struct node *root; char fname[MAXPATHLEN + 1]; + char include_fname[MAXPATHLEN + 128 +1]; + int idx; int tok; while ((opt = getopt(argc, argv, "help:t")) != EOF) @@ -955,13 +957,24 @@ return (0); } sprintf(fname, "%stree.h", file_prefix); + + /*prepare the ifndef directive*/ + memset(include_fname,'\0',sizeof(include_fname)); + snprintf(include_fname, MAXPATHLEN + 128, "_%sTREE_H_INCLUDED__",file_prefix); + for(idx = 0; idx < strlen(include_fname); idx++){ + include_fname[idx] = toupper(include_fname[idx]); + } + if ((fp = fopen(fname, "w")) == NULL) err(1, "%s: ", fname); + + fprintf(fp, "#ifndef %s\n",include_fname); + fprintf(fp, "#define %s\n",include_fname); gen_header(root, PREFIX_LEN, NULL); fprintf(fp, "#define %sCTREE_SIZE %u\n", file_prefix, tree_size); fprintf(fp, "extern const struct snmp_node %sctree[];\n", file_prefix); - + fprintf(fp, "#endif /* %s */\n",include_fname); fclose(fp); sprintf(fname, "%stree.c", file_prefix); From owner-p4-projects@FreeBSD.ORG Sun Jul 10 22:52:13 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91C6716A420; Sun, 10 Jul 2005 22:52:12 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 656A116A41F for ; Sun, 10 Jul 2005 22:52:12 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E1AB43D48 for ; Sun, 10 Jul 2005 22:52:12 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6AMqCYV039670 for ; Sun, 10 Jul 2005 22:52:12 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6AMqCL8039667 for perforce@freebsd.org; Sun, 10 Jul 2005 22:52:12 GMT (envelope-from soc-andrew@freebsd.org) Date: Sun, 10 Jul 2005 22:52:12 GMT Message-Id: <200507102252.j6AMqCL8039667@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 79941 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 22:52:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=79941 Change 79941 by soc-andrew@soc-andrew_serv on 2005/07/10 22:51:30 Add lines to rc.conf to stop unneeded thingd from being run and remove an i386ism Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#6 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#6 (text+ko) ==== @@ -773,8 +773,15 @@ mkdir ${RD}/bsdinstaller/root/$$dir; \ done ) @echo "/dev/acd0 /usr cd9660 ro 0 0" > ${RD}/bsdinstaller/root/etc/fstab + @echo "sendmail_enable=\"NONE\"" > ${RD}/bsdinstaller/root/etc/rc.conf + @echo "cron_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf + @echo "devd_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf + @echo "syslogd_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf @cat ${.CURDIR}/bsdinstaller/gettytab >> ${RD}/bsdinstaller/root/etc/gettytab - cp ${.CURDIR}/bsdinstaller/ttys.i386 ${RD}/bsdinstaller/root/etc/ttys + ( if [ -f ${.CURDIR}/bsdinstaller/ttys.${TARGET_ARCH} ]; then \ + cp ${.CURDIR}/bsdinstaller/ttys.${TARGET_ARCH} \ + ${RD}/bsdinstaller/root/etc/ttys; \ + fi ) cp ${.CURDIR}/bsdinstaller/bsdinstaller_shell.sh ${RD}/bsdinstaller/root/ chmod u+x ${RD}/bsdinstaller/root/bsdinstaller_shell.sh cp ${RD}/bsdinstaller/root/etc/master.passwd ${RD}/bsdinstaller/master.passwd From owner-p4-projects@FreeBSD.ORG Sun Jul 10 22:55:17 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E277A16A420; Sun, 10 Jul 2005 22:55:16 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BD08A16A41C for ; Sun, 10 Jul 2005 22:55:16 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7470A43D45 for ; Sun, 10 Jul 2005 22:55:16 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6AMtGDR039785 for ; Sun, 10 Jul 2005 22:55:16 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6AMtGN5039782 for perforce@freebsd.org; Sun, 10 Jul 2005 22:55:16 GMT (envelope-from soc-andrew@freebsd.org) Date: Sun, 10 Jul 2005 22:55:16 GMT Message-Id: <200507102255.j6AMtGN5039782@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 79942 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 22:55:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=79942 Change 79942 by soc-andrew@soc-andrew_serv on 2005/07/10 22:54:24 Bring up to date with vendor Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/share/Makefile#1 branch Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#3 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.880 2005/06/30 18:17:09 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.883 2005/07/10 03:47:00 hrs Exp $ 2000 @@ -255,6 +255,9 @@ and threads currently holding sleep mutexes (and spin mutexes for the current thread). &merged; + The kernel crash dump format has been changed to + ELF to support large memory (more than 4GB) environment. + The &man.ichsmb.4; driver is now available as a loadable kernel module. @@ -533,7 +536,7 @@ The &man.uart.4; driver is now enabled in the GENERIC kernel, and is now the - default driver for serial ports. The ofw_console and + default driver for serial ports. The &man.ofw.console.4; and &man.sab.4; drivers are now disabled in the GENERIC kernel. &merged; @@ -556,6 +559,9 @@ controller found on &ultrasparc; workstations. &merged; + The &man.snd.csa.4; driver now supports + suspend and resume operation. + The &man.uaudio.4; driver now has some added functionality, including volume control on more inputs and recording capability on some devices. &merged; @@ -651,6 +657,8 @@ This driver also now supports jumbo frames on Yukon-based interfaces. &merged; + The &man.ste.4; driver now has support for &man.altq.4;. + The &man.vge.4; driver now has support for device polling (&man.polling.4;). @@ -751,6 +759,13 @@ The &man.sppp.4; driver is now MPSAFE. + The &os; routing table now requires gateways for routes + to be of the same address family as the route itself. + The &man.route.8; utility now rejects a combination of different + address families. For example: + + &prompt.root; route add 10.1.1.1 -inet6 fe80::1%fxp0 + The new sysctl net.link.tap.user_open has been implemented. This allows unprivileged access to &man.tap.4; device nodes based on file system permissions. @@ -930,6 +945,19 @@ flag, which supports changing flags on symbolic links. + The &man.env.1; program now supports a + flag to write the command to standard error before it is executed. + + The &man.env.1; program now supports a + option to split the string and pass them to + the command as the command-line arguments. + + The &man.env.1; program now supports a + option to set the command search path used to look for + the command. + The &man.ftpd.8; program now uses the 212 and 213 status codes for directory and file status correctly (211 was used in @@ -1008,6 +1036,11 @@ The on-disk format of LC_CTYPE files has been changed to be machine-independent. + The libkvm now supports + ELF crash dump on amd64 and i386 platforms, + large crash dump (more than 4GB) in 32-bit platforms, + and PAE crash dump on i386 platform. + The &man.mixer.8; utility now supports the option. This is the same as the option but does not output mixing field separators. @@ -1294,6 +1327,11 @@ The rc.d/bsnmpd startup script for &man.bsnmpd.1; has been added. + The rc.d/jail startup script + now supports jail_name_flags + variable which allows to specify &man.jail.8; flags. + &merged; + &man.rc.conf.5; now supports changes of network interface names at boot time. &merged; For example: @@ -1482,7 +1520,7 @@ The &man.pkg.version.1; utility now supports a flag, which causes only the INDEX file to be used for determining if a - package is out of date. + package is out of date. &merged; The ports/INDEX* @@ -1582,10 +1620,15 @@ Documentation of existing functionality has been improved by the addition of the following manual pages: &man.ataraid.4;, &man.bus.space.9;, + &man.central.4;, &man.clkbrd.4;, &man.creator.4;, &man.devfs.conf.5, &man.devfs.rules.5, - &man.pmap.page.init.9;, - &man.pthread.atfork.3;, - &man.sched.4bsd.4;, &man.sched.ule.4;, &man.snd.fm801.4;, + &man.ebus.4;, &man.eeprom.4;, + &man.fhc.4;, + &man.machfb.4;, + &man.ofw.console.4;, &man.openfirm.4;, &man.openprom.4;, + &man.pmap.page.init.9;, &man.pthread.atfork.3;, + &man.rtc.4;, + &man.sbus.4;, &man.sched.4bsd.4;, &man.sched.ule.4;, &man.snd.fm801.4;, &man.snd.neomagic.4;, &man.snd.via8233.4;, &man.snd.via82c686.4;, and &man.snd.vibes.4;. From owner-p4-projects@FreeBSD.ORG Sun Jul 10 23:42:15 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BCE816A420; Sun, 10 Jul 2005 23:42:14 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3F1B116A41C for ; Sun, 10 Jul 2005 23:42:14 +0000 (GMT) (envelope-from soc-anders@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E373343D48 for ; Sun, 10 Jul 2005 23:42:13 +0000 (GMT) (envelope-from soc-anders@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6ANgDCG043159 for ; Sun, 10 Jul 2005 23:42:13 GMT (envelope-from soc-anders@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6ANgD8N043156 for perforce@freebsd.org; Sun, 10 Jul 2005 23:42:13 GMT (envelope-from soc-anders@freebsd.org) Date: Sun, 10 Jul 2005 23:42:13 GMT Message-Id: <200507102342.j6ANgD8N043156@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-anders@freebsd.org using -f From: soc-anders To: Perforce Change Reviews Cc: Subject: PERFORCE change 79944 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 23:42:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=79944 Change 79944 by soc-anders@soc-anders_gimli on 2005/07/10 23:41:12 Multicast information (-a switch) now works and all if_var.h references have been removed from if.c. Request count info (ifmultiaddr.ifma_refcount) is currently not available. Affected files ... .. //depot/projects/soc2005/ifcleanup/src/src/usr.bin/netstat/if.c#4 edit Differences ... ==== //depot/projects/soc2005/ifcleanup/src/src/usr.bin/netstat/if.c#4 (text+ko) ==== @@ -52,9 +52,7 @@ #include #include #include -/*#include */ #include -/*#include */ #include #include @@ -175,7 +173,8 @@ struct if_msghdr *ifm; struct ifa_msghdr *ifam; struct sockaddr *addr, *mask, *brd; - u_long mtu; + u_long if_mtu; + int if_index; if (_interval) { sidewaysintpr((unsigned)_interval, ifnetaddr); @@ -186,6 +185,7 @@ return; if ((buf = malloc(len)) == NULL) { printf("malloc\n"); + free(buf); return; } if (sysctl(mib, 6, buf, &len, NULL, 0) < 0) { @@ -247,7 +247,8 @@ *cp++ = '*'; *cp = '\0'; } - mtu = ifm->ifm_data.ifi_mtu; + if_mtu = ifm->ifm_data.ifi_mtu; + if_index = ifm->ifm_index; } else if (ifm->ifm_type == RTM_NEWADDR) { int addrs = ifm->ifm_addrs; @@ -305,7 +306,7 @@ printf("%-7.7s", name); else printf("%-5.5s", name); - printf(" %5lu ", mtu); + printf(" %5lu ", if_mtu); switch (addr->sa_family) { case AF_UNSPEC: printf("%-13.13s ", "none"); @@ -444,16 +445,11 @@ show_stat("d", 3, drops, link_layer); } putchar('\n'); - /* IFCLEANUP - * Skip mcast for now - */ -#if 0 - if (aflag && ifaddrfound) { + + if (aflag) { /* * Print family's multicast addresses */ - struct ifmultiaddr *multiaddr; - struct ifmultiaddr ifma; union { struct sockaddr sa; struct sockaddr_in in; @@ -461,20 +457,49 @@ struct sockaddr_in6 in6; #endif /* INET6 */ struct sockaddr_dl dl; - } msa; + } msa; const char *fmt; + struct ifma_msghdr *ifmam; + char *mbuf, *mcur, *mend; + size_t mlen; - TAILQ_FOREACH(multiaddr, &ifnet.if_multiaddrs, ifma_link) { - if (kread((u_long)multiaddr, (char *)&ifma, - sizeof ifma)) - break; - multiaddr = &ifma; - if (kread((u_long)ifma.ifma_addr, (char *)&msa, - sizeof msa)) - break; - if (msa.sa.sa_family != sa->sa_family) - continue; - + /* Request only the mcast MIB for the current if and af */ + mib[3] = addr->sa_family; + mib[4] = NET_RT_IFMALIST; + mib[5] = if_index; + if (sysctl(mib, 6, NULL, &mlen, NULL, 0) < 0) + continue; + if ((mbuf = malloc(mlen)) == NULL) { + printf("malloc\n"); + exit(1); + } + if (sysctl(mib, 6, mbuf, &mlen, NULL, 0) < 0) { + free(mbuf); + continue; + } + + mcur = mbuf; + mend = mcur + mlen; + while (mcur < mend) { + ifmam = (struct ifma_msghdr *)mcur; + int addrs = ifmam->ifmam_addrs; + mcur += sizeof(*ifmam); + while (addrs != 0) { + struct sockaddr *tmp = + (struct sockaddr *)mcur; + mcur += SA_SIZE(tmp); + if (addrs & RTA_GATEWAY) + addrs &= ~RTA_GATEWAY; + else if (addrs & RTA_IFP) + addrs &= ~RTA_IFP; + else if (addrs & RTA_IFA) { + bcopy(tmp, &msa, tmp->sa_len); + addrs &= ~RTA_IFA; + } else { + printf("UNEXPECTED: %x\n", addrs); + continue; + } + } fmt = 0; switch (msa.sa.sa_family) { case AF_INET: @@ -488,7 +513,11 @@ &msa.in6.sin6_addr, ntop_buf, sizeof(ntop_buf)), - ifma.ifma_refcount); + /* IFCLEANUP + * ifma.ifma_refcount + */ + 0); + break; #endif /* INET6 */ case AF_LINK: @@ -515,7 +544,6 @@ } } } -#endif /* if 0 */ } } From owner-p4-projects@FreeBSD.ORG Sun Jul 10 23:47:21 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05B3B16A420; Sun, 10 Jul 2005 23:47:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D3B0B16A41F for ; Sun, 10 Jul 2005 23:47:20 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8923443D45 for ; Sun, 10 Jul 2005 23:47:20 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6ANlKpc043946 for ; Sun, 10 Jul 2005 23:47:20 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6ANlKrE043943 for perforce@freebsd.org; Sun, 10 Jul 2005 23:47:20 GMT (envelope-from soc-andrew@freebsd.org) Date: Sun, 10 Jul 2005 23:47:20 GMT Message-Id: <200507102347.j6ANlKrE043943@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 79945 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2005 23:47:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=79945 Change 79945 by soc-andrew@soc-andrew_serv on 2005/07/10 23:46:29 Bring in src/etc/mtree/BSD.usr.dist Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/etc/mtree/BSD.usr.dist#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jul 11 01:21:17 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9584616A420; Mon, 11 Jul 2005 01:21:16 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4415A16A41C for ; Mon, 11 Jul 2005 01:21:16 +0000 (GMT) (envelope-from soc-anders@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F1CEC43D45 for ; Mon, 11 Jul 2005 01:21:15 +0000 (GMT) (envelope-from soc-anders@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6B1LFw5054197 for ; Mon, 11 Jul 2005 01:21:15 GMT (envelope-from soc-anders@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6B1LFPu054194 for perforce@freebsd.org; Mon, 11 Jul 2005 01:21:15 GMT (envelope-from soc-anders@freebsd.org) Date: Mon, 11 Jul 2005 01:21:15 GMT Message-Id: <200507110121.j6B1LFPu054194@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-anders@freebsd.org using -f From: soc-anders To: Perforce Change Reviews Cc: Subject: PERFORCE change 79947 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 01:21:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=79947 Change 79947 by soc-anders@soc-anders_gimli on 2005/07/11 01:20:53 Not needed to include Affected files ... .. //depot/projects/soc2005/ifcleanup/src/src/usr.bin/netstat/mcast.c#2 edit Differences ... ==== //depot/projects/soc2005/ifcleanup/src/src/usr.bin/netstat/mcast.c#2 (text+ko) ==== @@ -36,7 +36,6 @@ #include #include -#include #include #include #include From owner-p4-projects@FreeBSD.ORG Mon Jul 11 01:29:27 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9540D16A420; Mon, 11 Jul 2005 01:29:26 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6DF9A16A41C for ; Mon, 11 Jul 2005 01:29:26 +0000 (GMT) (envelope-from soc-tyler@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3FB3B43D4C for ; Mon, 11 Jul 2005 01:29:26 +0000 (GMT) (envelope-from soc-tyler@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6B1TQ74054482 for ; Mon, 11 Jul 2005 01:29:26 GMT (envelope-from soc-tyler@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6B1TPr9054476 for perforce@freebsd.org; Mon, 11 Jul 2005 01:29:25 GMT (envelope-from soc-tyler@freebsd.org) Date: Mon, 11 Jul 2005 01:29:25 GMT Message-Id: <200507110129.j6B1TPr9054476@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-tyler@freebsd.org using -f From: soc-tyler To: Perforce Change Reviews Cc: Subject: PERFORCE change 79948 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 01:29:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=79948 Change 79948 by soc-tyler@soc-tyler_launchd on 2005/07/11 01:29:13 Add main (launchd.c) source file from vendor code. Affected files ... .. //depot/projects/soc2005/launchd/Makefile#2 edit .. //depot/projects/soc2005/launchd/NOTES#3 edit .. //depot/projects/soc2005/launchd/launchd.c#1 add Differences ... ==== //depot/projects/soc2005/launchd/Makefile#2 (text+ko) ==== @@ -9,5 +9,6 @@ MAINTAINER= tyler@tamu.edu CFLAGS+= -g -Wall -W -Wshadow -Wpadded -Iincludes/ +LDADD+= -lutil .include ==== //depot/projects/soc2005/launchd/NOTES#3 (text+ko) ==== @@ -17,3 +17,4 @@ Zeroconf calls from launchd(8) can be made, and finally liblaunch can be fixed to accomodate. + From owner-p4-projects@FreeBSD.ORG Mon Jul 11 02:28:42 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A88C016A420; Mon, 11 Jul 2005 02:28:39 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AEC7D16A41C for ; Mon, 11 Jul 2005 02:28:38 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7391543D46 for ; Mon, 11 Jul 2005 02:28:38 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6B2Sctp056936 for ; Mon, 11 Jul 2005 02:28:38 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6B2Scra056933 for perforce@freebsd.org; Mon, 11 Jul 2005 02:28:38 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 11 Jul 2005 02:28:38 GMT Message-Id: <200507110228.j6B2Scra056933@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 79950 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 02:28:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=79950 Change 79950 by soc-andrew@soc-andrew_serv on 2005/07/11 02:28:29 Get the BSD Installer to the point of creating the slices and partitions Affected files ... .. //depot/projects/soc2005/bsdinstaller/scripts/build_patch.sh#4 edit .. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/installer/functions.c#2 edit .. //depot/projects/soc2005/bsdinstaller/src/etc/mtree/BSD.usr.dist#2 edit .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#7 edit .. //depot/projects/soc2005/bsdinstaller/src/share/Makefile#2 edit .. //depot/projects/soc2005/bsdinstaller/src/share/bsdinstaller/Makefile#1 add .. //depot/projects/soc2005/bsdinstaller/src/share/bsdinstaller/cmdnames.conf#1 add Differences ... ==== //depot/projects/soc2005/bsdinstaller/scripts/build_patch.sh#4 (text+ko) ==== @@ -3,10 +3,10 @@ # Script to create a patch and tarballs of files to use in release(7) # The files to diff -FILES="lib/Makefile usr.sbin/Makefile release/Makefile" +FILES="lib/Makefile usr.sbin/Makefile release/Makefile share/Makefile" # Dir's to create a tarball of:name for tarball -DIRS="contrib/bsdinstaller:base lib/bsdinstaller:lib usr.sbin/bsdinstaller:usr_sbin release/bsdinstaller:release" +DIRS="contrib/bsdinstaller:base lib/bsdinstaller:lib usr.sbin/bsdinstaller:usr_sbin release/bsdinstaller:release share/bsdinstaller:share" VENDOR="//depot/vendor/freebsd/src" BSDINS="//depot/projects/soc2005/bsdinstaller/src" ==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/installer/functions.c#2 (text+ko) ==== @@ -113,7 +113,7 @@ a->temp_files = aura_dict_new(23, AURA_DICT_HASH); a->cmd_names = config_vars_new(); if (!config_vars_read(a, a->cmd_names, CONFIG_TYPE_SH, - "usr/local/share/dfuibe_installer/cmdnames.conf")) { + "usr/share/bsdinstaller/cmdnames.conf")) { i_log(a, "! ERROR: Couldn't read cmdnames config file"); i_fn_args_free(a); return(NULL); ==== //depot/projects/soc2005/bsdinstaller/src/etc/mtree/BSD.usr.dist#2 (text+ko) ==== @@ -44,6 +44,8 @@ sbin .. share + bsdinstaller + .. calendar de_DE.ISO8859-1 .. ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#7 (text+ko) ==== @@ -772,7 +772,9 @@ ( for dir in dev mnt proc root tmp usr var ; do \ mkdir ${RD}/bsdinstaller/root/$$dir; \ done ) + @echo "/dev/acd0 /usr cd9660 ro 0 0" > ${RD}/bsdinstaller/root/etc/fstab + ln -s /usr/boot ${RD}/bsdinstaller/root/boot @echo "sendmail_enable=\"NONE\"" > ${RD}/bsdinstaller/root/etc/rc.conf @echo "cron_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf @echo "devd_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf ==== //depot/projects/soc2005/bsdinstaller/src/share/Makefile#2 (text+ko) ==== @@ -3,7 +3,8 @@ # Do not include `info' in the SUBDIR list, it is handled separately. -SUBDIR= colldef \ +SUBDIR= bsdinstaller \ + colldef \ ${_dict} \ ${_doc} \ examples \ From owner-p4-projects@FreeBSD.ORG Mon Jul 11 02:38:52 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 559BB16A420; Mon, 11 Jul 2005 02:38:52 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2F31116A41C for ; Mon, 11 Jul 2005 02:38:52 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C6AF443D49 for ; Mon, 11 Jul 2005 02:38:51 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6B2cpeD057365 for ; Mon, 11 Jul 2005 02:38:51 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6B2cpLt057362 for perforce@freebsd.org; Mon, 11 Jul 2005 02:38:51 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 11 Jul 2005 02:38:51 GMT Message-Id: <200507110238.j6B2cpLt057362@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 79952 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 02:38:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=79952 Change 79952 by soc-andrew@soc-andrew_serv on 2005/07/11 02:37:55 Missed the etc/mtree/BSD.usr.dist file for a diff in the release patch Affected files ... .. //depot/projects/soc2005/bsdinstaller/scripts/build_patch.sh#5 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/scripts/build_patch.sh#5 (text+ko) ==== @@ -3,7 +3,7 @@ # Script to create a patch and tarballs of files to use in release(7) # The files to diff -FILES="lib/Makefile usr.sbin/Makefile release/Makefile share/Makefile" +FILES="lib/Makefile usr.sbin/Makefile release/Makefile share/Makefile etc/mtree/BSD.usr.dist" # Dir's to create a tarball of:name for tarball DIRS="contrib/bsdinstaller:base lib/bsdinstaller:lib usr.sbin/bsdinstaller:usr_sbin release/bsdinstaller:release share/bsdinstaller:share" From owner-p4-projects@FreeBSD.ORG Mon Jul 11 03:58:41 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24C4C16A421; Mon, 11 Jul 2005 03:58:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F1E4F16A41C for ; Mon, 11 Jul 2005 03:58:40 +0000 (GMT) (envelope-from soc-tyler@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B254943D45 for ; Mon, 11 Jul 2005 03:58:40 +0000 (GMT) (envelope-from soc-tyler@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6B3weoF061159 for ; Mon, 11 Jul 2005 03:58:40 GMT (envelope-from soc-tyler@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6B3weMG061156 for perforce@freebsd.org; Mon, 11 Jul 2005 03:58:40 GMT (envelope-from soc-tyler@freebsd.org) Date: Mon, 11 Jul 2005 03:58:40 GMT Message-Id: <200507110358.j6B3weMG061156@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-tyler@freebsd.org using -f From: soc-tyler To: Perforce Change Reviews Cc: Subject: PERFORCE change 79958 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 03:58:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=79958 Change 79958 by soc-tyler@soc-tyler_launchd on 2005/07/11 03:58:02 Add launchd(8)'s init code, and a few modifications to the main source file. Remove final traces of XML code, I think we'll go with a property(3) based configuration file format for the duration of the SoC Affected files ... .. //depot/projects/soc2005/launchd/includes/launchd.h#2 edit .. //depot/projects/soc2005/launchd/init.8#1 add .. //depot/projects/soc2005/launchd/init.c#1 add .. //depot/projects/soc2005/launchd/launchd.c#2 edit .. //depot/projects/soc2005/launchd/launchd_xml.c#3 delete Differences ... ==== //depot/projects/soc2005/launchd/includes/launchd.h#2 (text+ko) ==== @@ -28,7 +28,8 @@ typedef void (*kq_callback)(void *, struct kevent *); extern kq_callback kqsimple_zombie_reaper; -extern mach_port_t launchd_bootstrap_port; +/* Mac OS/NeXT specific */ +//extern mach_port_t launchd_bootstrap_port; extern sigset_t blocked_signals; #ifdef PID1_REAP_ADOPTED_CHILDREN ==== //depot/projects/soc2005/launchd/launchd.c#2 (text+ko) ==== @@ -1,4 +1,31 @@ /* + * $FreeBSD$ + * + * Copyright (c) 2005 R. Tyler Ballance All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE * + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* * Copyright (c) 2005 Apple Computer, Inc. All rights reserved. * * @APPLE_LICENSE_HEADER_START@ @@ -20,6 +47,10 @@ * * @APPLE_LICENSE_HEADER_END@ */ + +/* Mac OS specific frameworks (and NeXT-specific for that matter) + * XXX: these need to be implemented or worked around in another manner +-------------------------------------------------------------------------------- #include #include #include @@ -27,15 +58,20 @@ #include #include #endif +-------------------------------------------------------------------------------- + */ #include #include #include #include +/* sys/param.h defines NGROUPS which is necessary for sys/ucred.h */ +#include #include #include #include #include #include +#include #include #include #include @@ -65,7 +101,10 @@ #include "launch_priv.h" #include "launchd.h" +/* Another mach/Mac OS specific header that's been stripped out for FreeBSD + * related work, similar items on FreeBSD might be related to init(8) #include "bootstrap_internal.h" + */ #define LAUNCHD_MIN_JOB_RUN_TIME 10 #define LAUNCHD_REWARD_JOB_RUN_TIME 60 @@ -73,8 +112,10 @@ #define PID1LAUNCHD_CONF "/etc/launchd.conf" #define LAUNCHD_CONF ".launchd.conf" #define LAUNCHCTL_PATH "/bin/launchctl" +/* Mac OS specific #define SECURITY_LIB "/System/Library/Frameworks/Security.framework/Versions/A/Security" #define VOLFSDIR "/.vol" + */ extern char **environ; @@ -180,13 +221,17 @@ static bool launchd_inited = false; static bool shutdown_in_progress = false; static pthread_t mach_server_loop_thread; +/* We undeclared this variable in includes/launchd.h so we will do so here as + * well. (on Darwin, mach_port_t is an unsigned int, it's purpose escapes me.. + * I would assume it's related to mach's bootstrap concept, so I should probably + * hit it as I replace init(8) mach_port_t launchd_bootstrap_port = MACH_PORT_NULL; + */ sigset_t blocked_signals = 0; static char *pending_stdout = NULL; static char *pending_stderr = NULL; -int main(int argc, char *argv[]) -{ +int main(int argc, char *argv[]) { static const int sigigns[] = { SIGHUP, SIGINT, SIGPIPE, SIGALRM, SIGTERM, SIGURG, SIGTSTP, SIGTSTP, SIGCONT, /*SIGCHLD,*/ SIGTTIN, SIGTTOU, SIGIO, SIGXCPU, SIGXFSZ, SIGVTALRM, SIGPROF, From owner-p4-projects@FreeBSD.ORG Mon Jul 11 04:53:49 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC1B216A420; Mon, 11 Jul 2005 04:53:48 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6B50D16A41C for ; Mon, 11 Jul 2005 04:53:48 +0000 (GMT) (envelope-from soc-tyler@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3922743D49 for ; Mon, 11 Jul 2005 04:53:48 +0000 (GMT) (envelope-from soc-tyler@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6B4rmuH070325 for ; Mon, 11 Jul 2005 04:53:48 GMT (envelope-from soc-tyler@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6B4rlvO070322 for perforce@freebsd.org; Mon, 11 Jul 2005 04:53:47 GMT (envelope-from soc-tyler@freebsd.org) Date: Mon, 11 Jul 2005 04:53:47 GMT Message-Id: <200507110453.j6B4rlvO070322@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-tyler@freebsd.org using -f From: soc-tyler To: Perforce Change Reviews Cc: Subject: PERFORCE change 79960 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 04:53:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=79960 Change 79960 by soc-tyler@soc-tyler_launchd on 2005/07/11 04:53:03 To init.c or not to init.c, oi Affected files ... .. //depot/projects/soc2005/launchd/Makefile#3 edit .. //depot/projects/soc2005/launchd/NOTES#4 edit .. //depot/projects/soc2005/launchd/init.c#2 edit Differences ... ==== //depot/projects/soc2005/launchd/Makefile#3 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= launchd -SRCS= launchd.c liblaunch.c launchdebugd.c launchproxy.c +SRCS= launchd.c liblaunch.c launchdebugd.c launchproxy.c init.c MAN= launchd.conf.5 launchd.plist.5 init.8 launchd.8 \ launchd_debug.8 launchproxy.8 rc.8 service.8 ==== //depot/projects/soc2005/launchd/NOTES#4 (text+ko) ==== @@ -18,3 +18,7 @@ fixed to accomodate. + o Regarding init(8) I'm still wondering whether or not it'd be best to take the stock + FreeBSD init(8) code, or the code that zarzycki@ and NeXT have modified for + Mac OS X (and NeXTStep). i.e. Fresh start or hackery begets hackery... + ==== //depot/projects/soc2005/launchd/init.c#2 (text+ko) ==== @@ -57,11 +57,13 @@ * SUCH DAMAGE. */ +/* Mac OS specifics #include #include #include #include +*/ #include #include @@ -90,7 +92,9 @@ #include #include "launchd.h" +/* mach/Mac OS specific #include "bootstrap_internal.h" +*/ #define _PATH_RUNCOM "/etc/rc" From owner-p4-projects@FreeBSD.ORG Mon Jul 11 04:59:56 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67F0D16A420; Mon, 11 Jul 2005 04:59:56 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4233316A41C for ; Mon, 11 Jul 2005 04:59:56 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 136B243D46 for ; Mon, 11 Jul 2005 04:59:56 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6B4xteZ070544 for ; Mon, 11 Jul 2005 04:59:55 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6B4xtYe070541 for perforce@freebsd.org; Mon, 11 Jul 2005 04:59:55 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 11 Jul 2005 04:59:55 GMT Message-Id: <200507110459.j6B4xtYe070541@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 79961 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 04:59:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=79961 Change 79961 by soc-andrew@soc-andrew_serv on 2005/07/11 04:59:10 Catchup with vendor Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#8 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.886 2005/06/16 18:16:13 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.887 2005/07/11 03:59:25 scottl Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -699,7 +699,8 @@ rm -rf ${RD}/mfsfd mkdir ${RD}/mfsfd cd ${RD}/mfsfd && \ - mkdir -p etc/defaults dev mnt stand/etc/defaults stand/help + mkdir -p etc/defaults dev mnt stand/etc/defaults stand/help \ + var/empty @cd ${.CURDIR} && $(MAKE) installCRUNCH CRUNCH=boot \ DIR=${RD}/mfsfd/stand ZIP=false ( cd ${RD}/mfsfd && \ @@ -712,6 +713,8 @@ ${RD}/mfsfd/etc/defaults/pccard.conf .endif cp ${.CURDIR}/../etc/usbd.conf ${RD}/mfsfd/etc/usbd.conf + cp ${.CURDIR}/../etc/master.passwd ${RD}/mfsfd/etc/master.passwd + pwd_mkdb -d ${RD}/mfsfd/etc -p ${RD}/mfsfd/etc/master.passwd ( for F in defaults/rc.conf netconfig protocols ; do \ sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \ ${RD}/trees/base/etc/$$F > ${RD}/mfsfd/stand/etc/$$F ; \ From owner-p4-projects@FreeBSD.ORG Mon Jul 11 08:39:27 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE78416A420; Mon, 11 Jul 2005 08:39:26 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8B6DC16A41C for ; Mon, 11 Jul 2005 08:39:26 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7488843D6D for ; Mon, 11 Jul 2005 08:39:19 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6B8dJ5P000965 for ; Mon, 11 Jul 2005 08:39:19 GMT (envelope-from soc-victor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6B8dJ9i000962 for perforce@freebsd.org; Mon, 11 Jul 2005 08:39:19 GMT (envelope-from soc-victor@freebsd.org) Date: Mon, 11 Jul 2005 08:39:19 GMT Message-Id: <200507110839.j6B8dJ9i000962@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-victor@freebsd.org using -f From: soc-victor To: Perforce Change Reviews Cc: Subject: PERFORCE change 79968 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 08:39:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=79968 Change 79968 by soc-victor@soc-victor_82.76.158.176 on 2005/07/11 08:38:32 Minor fixes: GMT offset, debug macro changed to print on stderr Affected files ... .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#3 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#2 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#2 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#2 edit Differences ... ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#3 (text+ko) ==== @@ -1,6 +1,6 @@ # # Copyright (c) 2005 The FreeBSD Project -# Author: Victor Crcueru +# Author: Victor Cruceru # CONTRIB=${.CURDIR}/../../../../contrib/bsnmp ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#2 (text+ko) ==== @@ -291,7 +291,7 @@ return 0; /*error*/ } - HR_DPRINTF(("Got boot timestamp from kernel:{%ld,%ld}\n", + HR_DPRINTF((stderr,"Got boot timestamp from kernel:{%ld,%ld}\n", kernel_boot_timestamp.tv_sec, kernel_boot_timestamp.tv_usec)); @@ -342,7 +342,7 @@ s_date_time[6] = tloc_tm.tm_sec; s_date_time[7] = right_now.tv_usec/100000; /*deci-seconds */ - if (tloc_tm.tm_gmtoff > 0){ + if (tloc_tm.tm_gmtoff < 0){ s_date_time[8] = '-'; }else{ s_date_time[8] = '+'; @@ -380,7 +380,7 @@ } (void)strncpy(hostres_ctx_g.k_boot_line, buf, 127); - HR_DPRINTF(("Got kernel boot file; %s\n",hostres_ctx_g.k_boot_line)); + HR_DPRINTF((stderr,"Got kernel boot file: %s\n",hostres_ctx_g.k_boot_line)); free(buf); } return ((u_char*)&hostres_ctx_g.k_boot_line[0]); @@ -437,7 +437,7 @@ syslog(LOG_ERR,"sysctl KERN_MAXPROC failed: %m "); return -1; /*error*/ } - HR_DPRINTF(("Got kernel maxporc; %d\n",hostres_ctx_g.max_proc)); + HR_DPRINTF((stderr, "Got kernel maxporc: %d\n",hostres_ctx_g.max_proc)); } return hostres_ctx_g.max_proc; ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#2 (text+ko) ==== @@ -85,7 +85,7 @@ } - HR_DPRINTF(("[%s] done.\n", __FUNCTION__)); + HR_DPRINTF((stderr,"[%s] done.\n", __FUNCTION__)); return (0); } @@ -127,7 +127,7 @@ if( host_registration_id > 0){ or_unregister(host_registration_id); } - HR_DPRINTF(("[%s] done.\n", __FUNCTION__)); + HR_DPRINTF((stderr,"[%s] done.\n", __FUNCTION__)); return (0); } @@ -138,7 +138,7 @@ static void hostres_idle_v(void){ /*nothing iteresting here for the time being*/ - HR_DPRINTF(("[%s] done.\n ", __FUNCTION__)); + HR_DPRINTF((stderr,"[%s] done.\n ", __FUNCTION__)); } /* @@ -148,7 +148,7 @@ static void hostres_dump_v(void){ /*nothing iteresting here for the time being*/ - HR_DPRINTF(("[%s] done.\n ", __FUNCTION__)); + HR_DPRINTF((stderr, "[%s] done.\n ", __FUNCTION__)); } @@ -159,7 +159,7 @@ static void hostres_config_v(void){ /*nothing iteresting here for the time being*/ - HR_DPRINTF(("[%s] done.\n ", __FUNCTION__)); + HR_DPRINTF((stderr, "[%s] done.\n ", __FUNCTION__)); } @@ -172,7 +172,7 @@ goto LABEL_RETURN; } LABEL_RETURN:; - HR_DPRINTF(("[%s] done.\n ", __FUNCTION__)); + HR_DPRINTF((stderr,"[%s] done.\n ", __FUNCTION__)); } /* @@ -184,7 +184,7 @@ host_registration_id = or_register(&oid_host, "The MIB module for host resource mib (rfc 2790).", hostres_module); - HR_DPRINTF(("[%s] done.\n ", __FUNCTION__)); + HR_DPRINTF((stderr, "[%s] done.\n ", __FUNCTION__)); } /*this identifies the HOST RESOURCES mib module*/ ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#2 (text+ko) ==== @@ -42,8 +42,7 @@ /*a debug macro*/ #ifndef NDEBUG -#include -#define HR_DPRINTF(args) (printf("HR DEBUG: "), printf args) +#define HR_DPRINTF(args) (fprintf(stderr,"HR DEBUG: "), fprintf args) #else From owner-p4-projects@FreeBSD.ORG Mon Jul 11 11:08:16 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7AF616A420; Mon, 11 Jul 2005 11:08:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 88AED16A41C for ; Mon, 11 Jul 2005 11:08:15 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D77043D53 for ; Mon, 11 Jul 2005 11:08:15 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6BB8F5S013724 for ; Mon, 11 Jul 2005 11:08:15 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6BB8ExJ013721 for perforce@freebsd.org; Mon, 11 Jul 2005 11:08:14 GMT (envelope-from soc-bushman@freebsd.org) Date: Mon, 11 Jul 2005 11:08:14 GMT Message-Id: <200507111108.j6BB8ExJ013721@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 79976 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 11:08:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=79976 Change 79976 by soc-bushman@soc-bushman_stinger on 2005/07/11 11:07:56 last submit Affected files ... .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getservent.c#8 edit .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/netdb_private.h#4 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_keys/auth.c#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_keys/auth.h#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_keys/auth2-hostbased.c#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_keys/auth2.c#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_keys/hostfile.c#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_keys/hostfile.h#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_keys/key.h#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/ssh_keys/sshconnect.c#2 edit Differences ... ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getservent.c#8 (text+ko) ==== @@ -64,6 +64,9 @@ { SETSERVENT = 1, ENDSERVENT = 2, + SERVENT_UNPACK_SUCCES = 3, + SERVENT_UNPACK_ERANGE = 4, + SERVENT_UNPACK_ERROR = 5, SERVENT_STORAGE_INITIAL = 1 << 10, /* 1 KByte */ SERVENT_STORAGE_MAX = 1 << 20, /* 1 MByte */ }; @@ -79,7 +82,7 @@ { NULL, 0 } }; -static int servent_unpack(char *, struct servent *, char **, size_t, int *); +static enum constants servent_unpack(char *, struct servent *, char **, size_t); /* files backend declarations */ struct files_state @@ -132,25 +135,24 @@ }; }; -static int wrap_getservbyname_r(struct key key, struct servent *serv, char *buffer, - size_t bufsize, struct servent **res); -static int wrap_getservbyport_r(struct key key, struct servent *serv, char *buffer, - size_t bufsize, struct servent **res); -static int wrap_getservent_r(struct key key, struct servent *serv, char *buffer, - size_t bufsize, struct servent **res); -static struct servent *getserv(int (*fn)(struct key, struct servent *, char *, - size_t, struct servent **), struct key key); +static struct servent *wrap_getservbyname_r(struct key key, struct servent *serv, + char *buffer, size_t bufsize); +static struct servent *wrap_getservbyport_r(struct key key, struct servent *serv, + char *buffer, size_t bufsize); +static struct servent *wrap_getservent_r(struct key key, struct servent *serv, + char *buffer, size_t bufsize); +static struct servent *getserv(struct servent *(*fn)(struct key, struct servent *, char *, + size_t), struct key key); -static int -servent_unpack(char *p, struct servent * serv, char ** aliases, size_t aliases_size, - int * errnop) +static enum constants +servent_unpack(char *p, struct servent * serv, char ** aliases, size_t aliases_size) { char *cp, **q, *endp; long l; if (*p == '#') - return -1; + return SERVENT_UNPACK_ERROR; memset(serv, 0, sizeof(struct servent)); @@ -161,18 +163,18 @@ p = strpbrk(p, " \t"); if (p == NULL) - return -1; + return SERVENT_UNPACK_ERROR; *p++ = '\0'; while (*p == ' ' || *p == '\t') p++; cp = strpbrk(p, ",/"); if (cp == NULL) - return -1; + return SERVENT_UNPACK_ERROR; *cp++ = '\0'; l = strtol(p, &endp, 10); if (endp == p || *endp != '\0' || l < 0 || l > USHRT_MAX) - return -1; + return SERVENT_UNPACK_ERROR; serv->s_port = htons((in_port_t)l); serv->s_proto = cp; @@ -189,8 +191,7 @@ *q++ = cp; } else { *q = NULL; - *errnop = ERANGE; - return -1; + return SERVENT_UNPACK_ERANGE; } cp = strpbrk(cp, " \t"); if (cp != NULL) @@ -198,7 +199,7 @@ } *q = NULL; - return 0; + return SERVENT_UNPACK_SUCCES; } /* files backend implementation */ @@ -249,7 +250,6 @@ struct servent *serv; char *buffer; size_t bufsize; - int *errnop; char **aliases; int aliases_size; @@ -278,19 +278,18 @@ serv = va_arg(ap, struct servent *); buffer = va_arg(ap, char *); bufsize = va_arg(ap, size_t); - errnop = va_arg(ap,int *); - *errnop = files_getstate(&st); - if (*errnop != 0) + rv = files_getstate(&st); + if (rv != 0) { + errno = rv; return (NS_UNAVAIL); + } if (st->fp == NULL) st->compat_mode_active = 0; - if (st->fp == NULL && (st->fp = fopen(_PATH_SERVICES, "r")) == NULL) { - *errnop = errno; + if (st->fp == NULL && (st->fp = fopen(_PATH_SERVICES, "r")) == NULL) return (NS_UNAVAIL); - } if (serv_mdata->how == nss_lt_all) stayopen = 1; @@ -303,7 +302,6 @@ do { if (!st->compat_mode_active) { if ((line = fgetln(st->fp, &linesize)) == NULL) { - *errnop = errno; rv = NS_RETURN; break; } @@ -313,14 +311,14 @@ st->compat_mode_active = 1; } else { if (bufsize <= linesize + _ALIGNBYTES + sizeof(char *)) { - *errnop = ERANGE; + errno = ERANGE; rv = NS_RETURN; break; } aliases = (char **)_ALIGN(&buffer[linesize+1]); aliases_size = (buffer + bufsize - (char *)aliases)/sizeof(char *); if (aliases_size < 1) { - *errnop = ERANGE; + errno = ERANGE; rv = NS_RETURN; break; } @@ -334,15 +332,15 @@ switch (serv_mdata->how) { case nss_lt_name: rv = nsdispatch(retval, compat_dtab, NSDB_SERVICES_COMPAT, "getservbyname_r", - compat_src, name, proto, serv, buffer, bufsize, errnop); + compat_src, name, proto, serv, buffer, bufsize); break; case nss_lt_id: rv = nsdispatch(retval, compat_dtab, NSDB_SERVICES_COMPAT, "getservbyport_r", - compat_src, port, proto, serv, buffer, bufsize, errnop); + compat_src, port, proto, serv, buffer, bufsize); break; case nss_lt_all: rv = nsdispatch(retval, compat_dtab, NSDB_SERVICES_COMPAT, "getservent_r", - compat_src, serv, buffer, bufsize, errnop); + compat_src, serv, buffer, bufsize); break; } @@ -352,17 +350,18 @@ continue; } - rv = servent_unpack(line, serv, aliases, aliases_size, errnop); - if (rv !=0 ) { - if (*errnop == 0) { - rv = NS_NOTFOUND; - continue; - } - else { - rv = NS_RETURN; - break; - } - } + switch (servent_unpack(line, serv, aliases, aliases_size)) + { + case SERVENT_UNPACK_ERROR: + rv = NS_NOTFOUND; + continue; + case SERVENT_UNPACK_ERANGE: + errno = ERANGE; + rv = NS_RETURN; + goto fin; + default: + break; + }; switch (serv_mdata->how) { case nss_lt_name: @@ -390,13 +389,14 @@ } } while (!(rv & NS_TERMINATE)); - + +fin: if (!stayopen && st->fp!=NULL) { fclose(st->fp); st->fp = NULL; } - if ((rv ==NS_SUCCESS) && (retval != NULL)) + if ((rv == NS_SUCCESS) && (retval != NULL)) *(struct servent **)retval=serv; return (rv); @@ -463,7 +463,6 @@ struct servent *serv; char *buffer; size_t bufsize; - int *errnop; char **aliases; int aliases_size; @@ -489,18 +488,15 @@ serv = va_arg(ap, struct servent *); buffer = va_arg(ap, char *); bufsize = va_arg(ap, size_t); - errnop = va_arg(ap, int *); - *errnop = nis_getstate(&st); - if (*errnop != 0) + rv = nis_getstate(&st); + if (rv != 0) { + errno = rv; return (NS_UNAVAIL); + } - if (st->yp_domain[0] == '\0') { - if (getdomainname(st->yp_domain, sizeof st->yp_domain)) { - *errnop=errno; + if ((st->yp_domain[0] == '\0') && (getdomainname(st->yp_domain, sizeof st->yp_domain))) return (NS_UNAVAIL); - } - } do { switch (how) @@ -567,7 +563,7 @@ /* we need a room for additional \n symbol */ if (bufsize <= resultbuflen +1 + _ALIGNBYTES + sizeof(char *)) { - *errnop = ERANGE; + errno = ERANGE; rv = NS_RETURN; break; } @@ -575,7 +571,7 @@ aliases=(char **)_ALIGN(&buffer[resultbuflen+2]); aliases_size = (buffer + bufsize - (char *)aliases)/sizeof(char *); if (aliases_size < 1) { - *errnop = ERANGE; + errno = ERANGE; rv = NS_RETURN; break; } @@ -585,15 +581,22 @@ buffer[resultbuflen] = '\n'; buffer[resultbuflen+1] = '\0'; - if (servent_unpack(buffer, serv, aliases, aliases_size, errnop) != 0) { - if (*errnop == 0) - rv = NS_NOTFOUND; - else - rv = NS_RETURN; + switch (servent_unpack(buffer, serv, aliases, aliases_size)) { + case SERVENT_UNPACK_ERANGE: + errno = ERANGE; + rv = NS_RETURN; + break; + case SERVENT_UNPACK_ERROR: + rv = NS_NOTFOUND; + break; + case SERVENT_UNPACK_SUCCES: + rv = NS_SUCCESS; + break; + default: + break; } + free(resultbuf); - rv = NS_SUCCESS; - } while (!(rv & NS_TERMINATE) && (how == nss_lt_all)); fin: @@ -665,9 +668,9 @@ } /* get**_r functions implementation */ -int +struct servent * getservbyname_r(const char *name, const char *proto, - struct servent *serv, char *buffer, size_t bufsize, struct servent **result) + struct servent *serv, char *buffer, size_t bufsize) { static const struct servent_mdata mdata = { nss_lt_name, 0 }; static const struct servent_mdata compat_mdata = { nss_lt_name, 1 }; @@ -681,22 +684,22 @@ { NULL, NULL, NULL } }; - int rv, ret_errno; + struct servent *result; + int rv; - ret_errno = 0; - *result = NULL; - rv = nsdispatch(result, dtab, NSDB_SERVICES, "getservbyname_r", defaultsrc, - name, proto, serv, buffer, bufsize, &ret_errno); + result = NULL; + rv = nsdispatch(&result, dtab, NSDB_SERVICES, "getservbyname_r", defaultsrc, + name, proto, serv, buffer, bufsize); if (rv == NS_SUCCESS) - return (0); + return (result); else - return (ret_errno); + return (NULL); } -int +struct servent * getservbyport_r(int port, const char *proto, struct servent *serv, char *buffer, - size_t bufsize, struct servent **result) + size_t bufsize) { static const struct servent_mdata mdata = { nss_lt_id, 0 }; static const struct servent_mdata compat_mdata = { nss_lt_id, 1 }; @@ -709,22 +712,22 @@ { NSSRC_COMPAT, files_servent, (void *)&compat_mdata }, { NULL, NULL, NULL } }; - int rv, ret_errno; + + struct servent *result; + int rv; - ret_errno = 0; - *result = NULL; - rv = nsdispatch(result, dtab, NSDB_SERVICES, "getservbyport_r", defaultsrc, - port, proto, serv, buffer, bufsize, &ret_errno); + result = NULL; + rv = nsdispatch(&result, dtab, NSDB_SERVICES, "getservbyport_r", defaultsrc, + port, proto, serv, buffer, bufsize); if (rv == NS_SUCCESS) - return (0); + return (result); else - return (ret_errno); + return (NULL); } -int -getservent_r(struct servent *serv, char *buffer, size_t bufsize, - struct servent **result) +struct servent * +getservent_r(struct servent *serv, char *buffer, size_t bufsize) { static const struct servent_mdata mdata = { nss_lt_all, 0 }; static const struct servent_mdata compat_mdata = { nss_lt_all, 1 }; @@ -737,17 +740,18 @@ { NSSRC_COMPAT, files_servent, (void *)&compat_mdata }, { NULL, NULL, NULL } }; - int rv, ret_errno; + + struct servent *result; + int rv; - ret_errno = 0; - *result = NULL; - rv = nsdispatch(result, dtab, NSDB_SERVICES, "getservent_r", defaultsrc, - serv, buffer, bufsize, &ret_errno); + result = NULL; + rv = nsdispatch(&result, dtab, NSDB_SERVICES, "getservent_r", defaultsrc, + serv, buffer, bufsize); if (rv == NS_SUCCESS) - return (0); + return (result); else - return (ret_errno); + return (NULL); } void @@ -791,30 +795,26 @@ free(p); } -static int -wrap_getservbyname_r(struct key key, struct servent *serv, char *buffer, size_t bufsize, - struct servent **res) +static struct servent * +wrap_getservbyname_r(struct key key, struct servent *serv, char *buffer, size_t bufsize) { - return (getservbyname_r(key.name, key.proto, serv, buffer, bufsize, res)); + return (getservbyname_r(key.name, key.proto, serv, buffer, bufsize)); } -static int -wrap_getservbyport_r(struct key key, struct servent *serv, char *buffer, size_t bufsize, - struct servent **res) +static struct servent * +wrap_getservbyport_r(struct key key, struct servent *serv, char *buffer, size_t bufsize) { - return (getservbyport_r(key.port, key.proto, serv, buffer, bufsize, res)); + return (getservbyport_r(key.port, key.proto, serv, buffer, bufsize)); } -static int -wrap_getservent_r(struct key key, struct servent *serv, char *buffer, size_t bufsize, - struct servent **res) +static struct servent * +wrap_getservent_r(struct key key, struct servent *serv, char *buffer, size_t bufsize) { - return (getservent_r(serv, buffer, bufsize, res)); + return (getservent_r(serv, buffer, bufsize)); } static struct servent * -getserv(int (*fn)(struct key, struct servent *, char *, size_t, struct servent **), - struct key key) +getserv(struct servent *(*fn)(struct key, struct servent *, char *, size_t), struct key key) { int rv; struct servent *res; @@ -833,12 +833,11 @@ st->bufsize = SERVENT_STORAGE_INITIAL; } do { - rv = fn(key, &st->serv, st->buffer, st->bufsize, &res); - if (res == NULL && rv == ERANGE) { + res = fn(key, &st->serv, st->buffer, st->bufsize); + if (res == NULL && errno == ERANGE) { free(st->buffer); if ((st->bufsize << 1) > SERVENT_STORAGE_MAX) { st->buffer = NULL; - errno = ERANGE; return (NULL); } st->bufsize <<= 1; @@ -846,7 +845,7 @@ if (st->buffer == NULL) return (NULL); } - } while (res == NULL && rv == ERANGE); + } while (res == NULL && errno == ERANGE); if (rv != 0) errno = rv; return (res); ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/netdb_private.h#4 (text+ko) ==== @@ -134,11 +134,11 @@ int getprotobyname_r(const char *, struct protoent *, struct protoent_data *); int getprotobynumber_r(int, struct protoent *, struct protoent_data *); int getprotoent_r(struct protoent *, struct protoent_data *); -int getservbyname_r(const char *, const char *, struct servent *, - char *, size_t, struct servent **); -int getservbyport_r(int, const char *, struct servent *, - char *, size_t, struct servent **); -int getservent_r(struct servent *, char *, size_t, struct servent **); +struct servent *getservbyname_r(const char *, const char *, struct servent *, + char *, size_t); +struct servent *getservbyport_r(int, const char *, struct servent *, + char *, size_t); +struct servent *getservent_r(struct servent *, char *, size_t); void sethostent_r(int, struct hostent_data *); void setnetent_r(int, struct netent_data *); void setprotoent_r(int, struct protoent_data *); ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_keys/auth.c#2 (text+ko) ==== @@ -399,8 +399,8 @@ /* return ok if key exists in sysfile or userfile */ HostStatus -check_key_in_hostfiles(struct passwd *pw, Key *key, const char *host, - const char *sysfile, const char *userfile) +check_key_in_user_hostfile(struct passwd *pw, Key *key, const char *host, + const char *userfile) { Key *found; char *user_hostfile; @@ -409,9 +409,9 @@ /* Check if we know the host and its host key. */ found = key_new(key->type); - host_status = check_host_in_hostfile(sysfile, host, key, found, NULL); - if (host_status != HOST_OK && userfile != NULL) { + host_status = HOST_NEW; + if (userfile != NULL) { user_hostfile = tilde_expand_filename(userfile, pw->pw_uid); if (options.strict_modes && (stat(user_hostfile, &st) == 0) && @@ -435,6 +435,22 @@ return host_status; } +/* return ok if key exists in sysfile or userfile */ +HostStatus +check_key_in_nsswitch(struct passwd *pw, Key *key, const char *host) +{ + Key *found; + HostStatus host_status; + + /* Check if we know the host and its host key. */ + found = key_new(key->type); + host_status = nsswitch_check_host(host, key, found); + key_free(found); + + debug2("check_key_in_nsswitch: key %s for %s", host_status == HOST_OK ? + "ok" : "not found", host); + return host_status; +} /* * Check a given file for security. This is defined as all components ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_keys/auth.h#2 (text+ko) ==== @@ -171,8 +171,11 @@ secure_filename(FILE *, const char *, struct passwd *, char *, size_t); HostStatus -check_key_in_hostfiles(struct passwd *, Key *, const char *, - const char *, const char *); +check_key_in_user_hostfile(struct passwd *, Key *, const char *, + const char *); + +HostStatus +check_key_in_nsswitch(struct passwd *, Key *, const char *); /* hostkey handling */ Key *get_hostkey_by_index(int); ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_keys/auth2-hostbased.c#2 (text+ko) ==== @@ -161,16 +161,18 @@ } debug2("userauth_hostbased: access allowed by auth_rhosts2"); - host_status = check_key_in_hostfiles(pw, key, lookup, - _PATH_SSH_SYSTEM_HOSTFILE, - options.ignore_user_known_hosts ? NULL : _PATH_SSH_USER_HOSTFILE); + host_status = check_key_in_nsswitch(pw, key, lookup); + + if (host_status == HOST_NEW) { + host_status = check_key_in_user_hostfile(pw, key, lookup, + options.ignore_user_known_hosts ? NULL : _PATH_SSH_USER_HOSTFILE); - /* backward compat if no key has been found. */ - if (host_status == HOST_NEW) - host_status = check_key_in_hostfiles(pw, key, lookup, - _PATH_SSH_SYSTEM_HOSTFILE2, - options.ignore_user_known_hosts ? NULL : - _PATH_SSH_USER_HOSTFILE2); + /* backward compat if no key has been found. */ + if (host_status == HOST_NEW) + host_status = check_key_in_user_hostfile(pw, key, lookup, + options.ignore_user_known_hosts ? NULL : + _PATH_SSH_USER_HOSTFILE2); + } return (host_status == HOST_OK); } ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_keys/auth2.c#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_keys/hostfile.c#2 (text+ko) ==== @@ -38,6 +38,9 @@ #include "includes.h" RCSID("$OpenBSD: hostfile.c,v 1.34 2005/03/10 22:01:05 deraadt Exp $"); +#include +#include +#include #include #include #include @@ -48,6 +51,148 @@ #include "hostfile.h" #include "log.h" #include "xmalloc.h" +#include "pathnames.h" + +struct nsswitch_files_configuration { + char *system_hostfile; + char *system_hostfile2; +}; + +static struct nsswitch_files_configuration nsswitch_files_conf = { + _PATH_SSH_SYSTEM_HOSTFILE, + _PATH_SSH_SYSTEM_HOSTFILE2 + }; + +void nsswitch_set_system_hostfiles(char *system_hostfile, + char *system_hostfile2) +{ + nsswitch_files_conf.system_hostfile = system_hostfile; + nsswitch_files_conf.system_hostfile2 = system_hostfile2; +} + +static HostStatus check_host_in_hostfile_by_key_or_type(const char *, + const char *, const Key *, int, Key *, int *); + +enum constants { + CHECK_HOST, + LOOKUP_KEY_BY_TYPE +}; + +static const ns_src defaultsrc[] = { + { NSSRC_FILES, NS_SUCCESS }, + { NULL, 0 } +}; + +static int files_check_host_by_key_or_type(void *, void *, va_list); + +/* files backend implementation */ +static int +files_check_host_by_key_or_type(void *result, void *mdata, va_list ap) +{ + const char *host; + const Key *key; + Key *found; + int keytype; + + int rv, numret; + char * filename; + enum constants how; + + how = (enum constants)mdata; + switch (how) { + case CHECK_HOST: + host = va_arg(ap, const char *); + key = va_arg(ap, const Key *); + found = va_arg(ap, Key *); + break; + case LOOKUP_KEY_BY_TYPE: + host = va_arg(ap, const char *); + keytype = va_arg(ap, int); + found = va_arg(ap, Key *); + break; + default: + return NS_NOTFOUND; + } + + switch (how) { + case CHECK_HOST: + filename = nsswitch_files_conf.system_hostfile; + rv = check_host_in_hostfile_by_key_or_type(filename, host, key, 0, + found, &numret); + if (rv == HOST_NEW) { + filename = nsswitch_files_conf.system_hostfile2; + rv = check_host_in_hostfile_by_key_or_type(filename, host, key, 0, + found, &numret); + } + + debug3("files_check_host_by_key_or_type: CHECK_HOST - %d", rv); + if (result != NULL) + *((int *)result) = rv; + return ((rv == HOST_NEW) ? NS_NOTFOUND : NS_SUCCESS); + + case LOOKUP_KEY_BY_TYPE: + filename = nsswitch_files_conf.system_hostfile; + rv = (check_host_in_hostfile_by_key_or_type(filename, host, NULL, + keytype, found, &numret) == HOST_FOUND); + if (rv == 0) { + filename = nsswitch_files_conf.system_hostfile2; + rv = (check_host_in_hostfile_by_key_or_type(filename, host, NULL, + keytype, found, &numret) == HOST_FOUND); + } + + debug3("files_check_host_by_key_or_type: LOOKUP_KEY_BY_TYPE - %d", rv); + if (result != NULL) + *((int *)result) = rv; + return ((rv == 0) ? NS_NOTFOUND : NS_SUCCESS); + } + + return (NS_NOTFOUND); +} + +/* nsswitch interface functions implementation */ +HostStatus +nsswitch_check_host(const char *host, const Key *key, Key *found) +{ + static const ns_dtab dtab[] = { + { NSSRC_FILES, files_check_host_by_key_or_type, (void *)CHECK_HOST }, + { NULL, NULL, NULL } + }; + + int rv; + HostStatus result; + + if (key == NULL) + fatal("no key to look up"); + + result = HOST_NEW; + rv = nsdispatch(&result, dtab, NSDB_SSH_HOSTKEYS, "check_host_by_key", defaultsrc, + host, key, found); + + if (rv == NS_SUCCESS) + return (result); + else + return (HOST_NEW); +} + +int +nsswitch_lookup_key_by_type(const char *host, int keytype, Key *found) +{ + static const ns_dtab dtab[] = { + { NSSRC_FILES, files_check_host_by_key_or_type, (void *)LOOKUP_KEY_BY_TYPE }, + { NULL, NULL, NULL } + }; + + int rv, result; + + result = 0; + rv = nsdispatch(&result, dtab, NSDB_SSH_HOSTKEYS, "lookup_key_by_type", defaultsrc, + host, keytype, found); + + if (rv == NS_SUCCESS) + return (result); + else + return (0); +} static int extract_salt(const char *s, u_int l, char *salt, size_t salt_len) ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_keys/hostfile.h#2 (text+ko) ==== @@ -30,4 +30,15 @@ char *host_hash(const char *, const char *, u_int); +/* + * Nsswitch declarations + * Here 2 functions are defined. Both are equivalents of the correspondent + * *_hostfile functions (defined above). But functions below don't have the + * 'file' argument, because they use nsswitch data source instead + */ + +void nsswitch_set_system_hostfiles(char *, char *); +HostStatus nsswitch_check_host(const char *, const Key *, Key *); +int nsswitch_lookup_key_by_type(const char *, int, Key *); + #endif ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_keys/key.h#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/ssh_keys/sshconnect.c#2 (text+ko) ==== @@ -637,9 +637,9 @@ host_status = check_host_in_hostfile(host_file, host, host_key, file_key, &host_line); if (host_status == HOST_NEW) { - host_file = system_hostfile; - host_status = check_host_in_hostfile(host_file, host, host_key, - file_key, &host_line); + host_file = "nsswitch"; + host_line = 0; + host_status = nsswitch_check_host(host, host_key, file_key); } /* * Also perform check for the ip address, skip the check if we are @@ -652,9 +652,9 @@ ip_status = check_host_in_hostfile(ip_file, ip, host_key, ip_key, &ip_line); if (ip_status == HOST_NEW) { - ip_file = system_hostfile; - ip_status = check_host_in_hostfile(ip_file, ip, - host_key, ip_key, &ip_line); + ip_file = "nsswitch"; + ip_line = 0; + ip_status = nsswitch_check_host(ip, host_key, ip_key); } if (host_status == HOST_CHANGED && (ip_status != HOST_CHANGED || !key_equal(ip_key, file_key))) @@ -1008,6 +1008,28 @@ return (ret); } +static int +show_key_from_nsswitch(const char *host, int keytype) +{ + Key *found; + char *fp; + int ret; + + found = key_new(keytype); + if ((ret = nsswitch_lookup_key_by_type(host, + keytype, found))) { + fp = key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX); + logit("WARNING: %s key found for host %s\n" + "via nsswitch\n" + "%s key fingerprint %s.", + key_type(found), host, + key_type(found), fp); + xfree(fp); + } + key_free(found); + return (ret); +} + /* print all known host keys for a given host, but skip keys of given type */ static int show_other_keys(const char *host, Key *key) @@ -1023,19 +1045,23 @@ found = 1; continue; } - if (type[i] != KEY_RSA1 && +/* if (type[i] != KEY_RSA1 && show_key_from_file(options.system_hostfile2, host, type[i])) { found = 1; continue; - } + }*/ if (show_key_from_file(options.user_hostfile, host, type[i])) { found = 1; continue; } - if (show_key_from_file(options.system_hostfile, host, type[i])) { + if (show_key_from_nsswitch(host, type[i])) { found = 1; continue; } +/* if (show_key_from_file(options.system_hostfile, host, type[i])) { + found = 1; + continue; + }*/ debug2("no key of type %d for host %s", type[i], host); } return (found); From owner-p4-projects@FreeBSD.ORG Mon Jul 11 11:25:28 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41B3516A421; Mon, 11 Jul 2005 11:25:28 +0000 (GMT) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F2DC516A41C; Mon, 11 Jul 2005 11:25:27 +0000 (GMT) (envelope-from ume@mahoroba.org) Received: from ameno.mahoroba.org (gw4.mahoroba.org [218.45.22.175]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1DE0343D46; Mon, 11 Jul 2005 11:25:26 +0000 (GMT) (envelope-from ume@mahoroba.org) Received: from localhost (IDENT:QmyQvbsgZPv2B2s4ITzpLTqNVLLB5H3gSIUe2YLwyIV6yKHctECmkLyBShAxVphQ@localhost [IPv6:::1]) (user=ume mech=CRAM-MD5 bits=0) by ameno.mahoroba.org (8.13.3/8.13.3) with ESMTP/inet6 id j6BBPM1K002130 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 11 Jul 2005 20:25:22 +0900 (JST) (envelope-from ume@mahoroba.org) Date: Mon, 11 Jul 2005 20:25:21 +0900 Message-ID: From: Hajimu UMEMOTO To: soc-bushman In-Reply-To: <200507111108.j6BB8ExJ013721@repoman.freebsd.org> References: <200507111108.j6BB8ExJ013721@repoman.freebsd.org> User-Agent: xcite1.38> Wanderlust/2.14.0 (Africa) SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 Emacs/21.3 (i386--freebsd) MULE/5.0 (SAKAKI) X-Operating-System: FreeBSD 5.4-STABLE X-PGP-Key: http://www.imasy.or.jp/~ume/publickey.asc X-PGP-Fingerprint: 1F00 0B9E 2164 70FC 6DC5 BF5F 04E9 F086 BF90 71FE Organization: Internet Mutual Aid Society, YOKOHAMA MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0 (ameno.mahoroba.org [IPv6:::1]); Mon, 11 Jul 2005 20:25:22 +0900 (JST) X-Virus-Scanned: by amavisd-new X-Virus-Status: Clean X-Spam-Status: No, score=-5.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.0.4 X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on ameno.mahoroba.org Cc: Perforce Change Reviews Subject: Re: PERFORCE change 79976 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 11:25:29 -0000 Hi, >>>>> On Mon, 11 Jul 2005 11:08:14 GMT >>>>> soc-bushman said: soc-bushman> ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/netdb_private.h#4 (text+ko) ==== soc-bushman> @@ -134,11 +134,11 @@ soc-bushman> int getprotobyname_r(const char *, struct protoent *, struct protoent_data *); soc-bushman> int getprotobynumber_r(int, struct protoent *, struct protoent_data *); soc-bushman> int getprotoent_r(struct protoent *, struct protoent_data *); soc-bushman> -int getservbyname_r(const char *, const char *, struct servent *, soc-bushman> - char *, size_t, struct servent **); soc-bushman> -int getservbyport_r(int, const char *, struct servent *, soc-bushman> - char *, size_t, struct servent **); soc-bushman> -int getservent_r(struct servent *, char *, size_t, struct servent **); soc-bushman> +struct servent *getservbyname_r(const char *, const char *, struct servent *, soc-bushman> + char *, size_t); soc-bushman> +struct servent *getservbyport_r(int, const char *, struct servent *, soc-bushman> + char *, size_t); soc-bushman> +struct servent *getservent_r(struct servent *, char *, size_t); soc-bushman> void sethostent_r(int, struct hostent_data *); soc-bushman> void setnetent_r(int, struct netent_data *); soc-bushman> void setprotoent_r(int, struct protoent_data *); Why did you need to change the return value of *_r() functions from int to struct servent *. Though *_r() are not exposed yet, these should be int for consistensy with other platforms. So, please don't change them. Sincerely, -- Hajimu UMEMOTO @ Internet Mutual Aid Society Yokohama, Japan ume@mahoroba.org ume@{,jp.}FreeBSD.org http://www.imasy.org/~ume/ From owner-p4-projects@FreeBSD.ORG Mon Jul 11 11:28:41 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4507C16A420; Mon, 11 Jul 2005 11:28:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0752D16A41C for ; Mon, 11 Jul 2005 11:28:41 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA6E943D48 for ; Mon, 11 Jul 2005 11:28:40 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6BBSeAV014714 for ; Mon, 11 Jul 2005 11:28:40 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6BBSeub014711 for perforce@freebsd.org; Mon, 11 Jul 2005 11:28:40 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 11 Jul 2005 11:28:40 GMT Message-Id: <200507111128.j6BBSeub014711@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 79978 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 11:28:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=79978 Change 79978 by soc-andrew@soc-andrew_serv on 2005/07/11 11:27:42 Start work on a working fn_install_os. Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/Makefile.inc1#2 edit .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/backend/Makefile#4 edit .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/backend/fn_install_freebsd.c#1 add Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/Makefile.inc1#2 (text+ko) ==== @@ -1,7 +1,9 @@ BSD_INSTALLER_DIR=${.CURDIR}/../../../contrib/bsdinstaller +BSD_INSTALLER_LIB_BUILD=${.CURDIR}/../../../lib/bsdinstaller BSD_INSTALLER_LIB=${.OBJDIR}/../../../lib/bsdinstaller CFLAGS+=-I${BSD_INSTALLER_DIR}/lib +CFLAGS+=-I${BSD_INSTALLER_LIB_BUILD} LIB_AURA=-L${BSD_INSTALLER_LIB}/aura -laura LIB_DFUI=-L${BSD_INSTALLER_LIB}/dfui -ldfui ==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/backend/Makefile#4 (text+ko) ==== @@ -1,7 +1,8 @@ PROG=bsd_installer_be SRCS=flow.c fn_configure.c fn_diagnostic.c \ - fn_disk.c fn_install.c fn_subpart.c main.c + fn_disk.c fn_subpart.c main.c +SRCS+=fn_install_freebsd.c NOMAN=1 From owner-p4-projects@FreeBSD.ORG Mon Jul 11 11:58:18 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1498216A420; Mon, 11 Jul 2005 11:58:18 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D100216A41C for ; Mon, 11 Jul 2005 11:58:17 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7285043D46 for ; Mon, 11 Jul 2005 11:58:17 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6BBwHVo036370 for ; Mon, 11 Jul 2005 11:58:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6BBwG6u036340 for perforce@freebsd.org; Mon, 11 Jul 2005 11:58:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 11 Jul 2005 11:58:16 GMT Message-Id: <200507111158.j6BBwG6u036340@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 79979 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 11:58:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=79979 Change 79979 by rwatson@rwatson_paprika on 2005/07/11 11:57:36 Allocate BSM event ID for sendfile(). Change BSM event ID for lchflags() to avoid a conflict with Darwin's taskforpid(). Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#11 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#11 (text+ko) ==== @@ -288,7 +288,8 @@ #define AUE_SYSCTL_NONADMIN 360 #define AUE_COPYFILE 361 #define AUE_LUTIMES 362 -#define AUE_LCHFLAGS 358 +#define AUE_LCHFLAGS 362 /* FreeBSD */ +#define AUE_SENDFILE 363 /* FreeBSD */ /* * XXXRW: Values not yet assigned. From owner-p4-projects@FreeBSD.ORG Mon Jul 11 12:37:08 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B265116A420; Mon, 11 Jul 2005 12:37:07 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8511316A41C for ; Mon, 11 Jul 2005 12:37:07 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F049043D53 for ; Mon, 11 Jul 2005 12:37:06 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6BCb6mq040412 for ; Mon, 11 Jul 2005 12:37:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6BCb6S1040409 for perforce@freebsd.org; Mon, 11 Jul 2005 12:37:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 11 Jul 2005 12:37:06 GMT Message-Id: <200507111237.j6BCb6S1040409@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 79984 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 12:37:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=79984 Change 79984 by rwatson@rwatson_paprika on 2005/07/11 12:36:33 Allocate AUE_USELIB for Linux and Linux emulation purposes. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#12 (text+ko) ==== @@ -290,6 +290,7 @@ #define AUE_LUTIMES 362 #define AUE_LCHFLAGS 362 /* FreeBSD */ #define AUE_SENDFILE 363 /* FreeBSD */ +#define AUE_USELIB 364 /* Linux */ /* * XXXRW: Values not yet assigned. From owner-p4-projects@FreeBSD.ORG Mon Jul 11 13:01:38 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8864E16A420; Mon, 11 Jul 2005 13:01:37 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3CBBD16A41C for ; Mon, 11 Jul 2005 13:01:37 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DCAEE43D45 for ; Mon, 11 Jul 2005 13:01:36 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6BD1alW048969 for ; Mon, 11 Jul 2005 13:01:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6BD1a1W048966 for perforce@freebsd.org; Mon, 11 Jul 2005 13:01:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 11 Jul 2005 13:01:36 GMT Message-Id: <200507111301.j6BD1a1W048966@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 79985 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 13:01:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=79985 Change 79985 by rwatson@rwatson_paprika on 2005/07/11 13:01:25 Assign initial audit event identifiers to most Linux emulated system calls on i386 and alpha. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_proto.h#4 edit .. //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_syscall.h#4 edit .. //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_sysent.c#4 edit .. //depot/projects/trustedbsd/audit3/sys/alpha/linux/syscalls.master#4 edit .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_proto.h#5 edit .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_syscall.h#5 edit .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysent.c#8 edit .. //depot/projects/trustedbsd/audit3/sys/i386/linux/syscalls.master#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_proto.h#4 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.21 2005/05/30 15:20:17 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.62 2005/05/30 15:09:16 rwatson Exp */ ==== //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_syscall.h#4 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.19 2005/05/30 15:20:17 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.62 2005/05/30 15:09:16 rwatson Exp */ ==== //depot/projects/trustedbsd/audit3/sys/alpha/linux/linux_sysent.c#4 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.19 2005/05/30 15:20:17 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.62 2005/05/30 15:09:16 rwatson Exp */ @@ -21,162 +21,162 @@ struct sysent linux_sysent[] = { #define nosys linux_nosys { 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = */ - { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_NULL }, /* 1 = exit */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_NULL }, /* 2 = linux_fork */ + { SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_fork, AUE_FORK }, /* 2 = linux_fork */ { SYF_MPSAFE | AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ { SYF_MPSAFE | AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 5 = */ - { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_NULL }, /* 6 = close */ - { SYF_MPSAFE | AS(osf1_wait4_args), (sy_call_t *)osf1_wait4, AUE_NULL }, /* 7 = osf1_wait4 */ + { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ + { SYF_MPSAFE | AS(osf1_wait4_args), (sy_call_t *)osf1_wait4, AUE_O_WAIT }, /* 7 = osf1_wait4 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 8 = */ - { AS(linux_link_args), (sy_call_t *)linux_link, AUE_NULL }, /* 9 = linux_link */ - { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_NULL }, /* 10 = linux_unlink */ + { AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK }, /* 9 = linux_link */ + { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK }, /* 10 = linux_unlink */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 11 = */ - { AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_NULL }, /* 12 = linux_chdir */ - { AS(fchdir_args), (sy_call_t *)fchdir, AUE_NULL }, /* 13 = fchdir */ - { AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_NULL }, /* 14 = linux_mknod */ - { AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_NULL }, /* 15 = linux_chmod */ - { AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_NULL }, /* 16 = linux_chown */ + { AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR }, /* 12 = linux_chdir */ + { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 13 = fchdir */ + { AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD }, /* 14 = linux_mknod */ + { AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD }, /* 15 = linux_chmod */ + { AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN }, /* 16 = linux_chown */ { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 17 = linux_brk */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 18 = */ - { AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_NULL }, /* 19 = linux_lseek */ - { 0, (sy_call_t *)getpid, AUE_NULL }, /* 20 = getpid */ + { AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK }, /* 19 = linux_lseek */ + { 0, (sy_call_t *)getpid, AUE_GETPID }, /* 20 = getpid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 21 = osf1_mount */ - { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_NULL }, /* 22 = linux_umount */ - { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_NULL }, /* 23 = setuid */ - { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_NULL }, /* 24 = getuid */ + { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UNMOUNT }, /* 22 = linux_umount */ + { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 23 = setuid */ + { SYF_MPSAFE | 0, (sy_call_t *)getuid, AUE_GETUID }, /* 24 = getuid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 25 = */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_ptrace, AUE_NULL }, /* 26 = linux_ptrace */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_ptrace, AUE_PTRACE }, /* 26 = linux_ptrace */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 27 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 28 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 29 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 30 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 31 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 32 = */ - { AS(linux_access_args), (sy_call_t *)linux_access, AUE_NULL }, /* 33 = linux_access */ + { AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS }, /* 33 = linux_access */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 34 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 35 = */ - { 0, (sy_call_t *)sync, AUE_NULL }, /* 36 = sync */ - { SYF_MPSAFE | AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_NULL }, /* 37 = linux_kill */ + { 0, (sy_call_t *)sync, AUE_SYNC }, /* 36 = sync */ + { SYF_MPSAFE | AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL }, /* 37 = linux_kill */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 38 = */ - { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_NULL }, /* 39 = setpgid */ + { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 39 = setpgid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 40 = */ - { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_NULL }, /* 41 = dup */ - { SYF_MPSAFE | 0, (sy_call_t *)pipe, AUE_NULL }, /* 42 = pipe */ + { SYF_MPSAFE | AS(dup_args), (sy_call_t *)dup, AUE_DUP }, /* 41 = dup */ + { SYF_MPSAFE | 0, (sy_call_t *)pipe, AUE_PIPE }, /* 42 = pipe */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 43 = osf_set_program_attributes */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 44 = */ - { AS(linux_open_args), (sy_call_t *)linux_open, AUE_NULL }, /* 45 = linux_open */ + { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC }, /* 45 = linux_open */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 46 = */ - { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_NULL }, /* 47 = getgid */ - { SYF_MPSAFE | AS(osf1_sigprocmask_args), (sy_call_t *)osf1_sigprocmask, AUE_NULL }, /* 48 = osf1_sigprocmask */ + { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_GETGID }, /* 47 = getgid */ + { SYF_MPSAFE | AS(osf1_sigprocmask_args), (sy_call_t *)osf1_sigprocmask, AUE_SIGPROCMASK }, /* 48 = osf1_sigprocmask */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 49 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 50 = */ - { AS(acct_args), (sy_call_t *)acct, AUE_NULL }, /* 51 = acct */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_sigpending, AUE_NULL }, /* 52 = linux_sigpending */ + { AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_sigpending, AUE_SIGPENDING }, /* 52 = linux_sigpending */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 53 = */ - { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_NULL }, /* 54 = linux_ioctl */ + { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL }, /* 54 = linux_ioctl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 55 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = */ - { AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_NULL }, /* 57 = linux_symlink */ - { AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_NULL }, /* 58 = linux_readlink */ - { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_NULL }, /* 59 = linux_execve */ - { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_NULL }, /* 60 = umask */ - { AS(chroot_args), (sy_call_t *)chroot, AUE_NULL }, /* 61 = chroot */ + { AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK }, /* 57 = linux_symlink */ + { AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK }, /* 58 = linux_readlink */ + { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE }, /* 59 = linux_execve */ + { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ + { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 62 = */ - { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_NULL }, /* 63 = getpgrp */ - { 0, (sy_call_t *)linux_getpagesize, AUE_NULL }, /* 64 = linux_getpagesize */ + { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 63 = getpgrp */ + { 0, (sy_call_t *)linux_getpagesize, AUE_O_GETPAGESIZE }, /* 64 = linux_getpagesize */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 65 = */ - { SYF_MPSAFE | 0, (sy_call_t *)linux_vfork, AUE_NULL }, /* 66 = linux_vfork */ - { AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_NULL }, /* 67 = linux_newstat */ - { AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_NULL }, /* 68 = linux_newlstat */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_vfork, AUE_VFORK }, /* 66 = linux_vfork */ + { AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT }, /* 67 = linux_newstat */ + { AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT }, /* 68 = linux_newlstat */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 69 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 70 = */ - { AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_NULL }, /* 71 = linux_mmap */ + { AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP }, /* 71 = linux_mmap */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 72 = */ - { AS(linux_munmap_args), (sy_call_t *)linux_munmap, AUE_NULL }, /* 73 = linux_munmap */ - { AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_NULL }, /* 74 = linux_mprotect */ - { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_NULL }, /* 75 = madvise */ + { AS(linux_munmap_args), (sy_call_t *)linux_munmap, AUE_MUNMAP }, /* 73 = linux_munmap */ + { AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT }, /* 74 = linux_mprotect */ + { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 75 = madvise */ { 0, (sy_call_t *)linux_vhangup, AUE_NULL }, /* 76 = linux_vhangup */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 77 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 78 = */ - { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_NULL }, /* 79 = linux_setgroups */ - { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_NULL }, /* 80 = linux_getgroups */ + { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS }, /* 79 = linux_setgroups */ + { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS }, /* 80 = linux_getgroups */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 81 = */ { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_NULL }, /* 82 = setpgid */ - { AS(osf1_setitimer_args), (sy_call_t *)osf1_setitimer, AUE_NULL }, /* 83 = osf1_setitimer */ + { AS(osf1_setitimer_args), (sy_call_t *)osf1_setitimer, AUE_SETITIMER }, /* 83 = osf1_setitimer */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 84 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 85 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = osf_getitimer */ - { 0, (sy_call_t *)linux_gethostname, AUE_NULL }, /* 87 = linux_gethostname */ - { SYF_MPSAFE | AS(sethostname_args), (sy_call_t *)osethostname, AUE_NULL }, /* 88 = osethostname */ - { 0, (sy_call_t *)linux_getdtablesize, AUE_NULL }, /* 89 = linux_getdtablesize */ - { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_NULL }, /* 90 = dup2 */ - { AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_NULL }, /* 91 = linux_newfstat */ - { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_NULL }, /* 92 = linux_fcntl */ - { AS(osf1_select_args), (sy_call_t *)osf1_select, AUE_NULL }, /* 93 = osf1_select */ - { AS(poll_args), (sy_call_t *)poll, AUE_NULL }, /* 94 = poll */ - { AS(fsync_args), (sy_call_t *)fsync, AUE_NULL }, /* 95 = fsync */ - { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_NULL }, /* 96 = setpriority */ - { AS(osf1_socket_args), (sy_call_t *)osf1_socket, AUE_NULL }, /* 97 = osf1_socket */ - { AS(linux_connect_args), (sy_call_t *)linux_connect, AUE_NULL }, /* 98 = linux_connect */ - { AS(accept_args), (sy_call_t *)oaccept, AUE_NULL }, /* 99 = accept */ + { 0, (sy_call_t *)linux_gethostname, AUE_O_GETHOSTNAME }, /* 87 = linux_gethostname */ + { SYF_MPSAFE | AS(sethostname_args), (sy_call_t *)osethostname, AUE_O_SETHOTNAME }, /* 88 = osethostname */ + { 0, (sy_call_t *)linux_getdtablesize, AUE_GETDTABLESIZE }, /* 89 = linux_getdtablesize */ + { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 90 = dup2 */ + { AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT }, /* 91 = linux_newfstat */ + { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL }, /* 92 = linux_fcntl */ + { AS(osf1_select_args), (sy_call_t *)osf1_select, AUE_SELECT }, /* 93 = osf1_select */ + { AS(poll_args), (sy_call_t *)poll, AUE_POLL }, /* 94 = poll */ + { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 95 = fsync */ + { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 96 = setpriority */ + { AS(osf1_socket_args), (sy_call_t *)osf1_socket, AUE_SOCKET }, /* 97 = osf1_socket */ + { AS(linux_connect_args), (sy_call_t *)linux_connect, AUE_CONNECT }, /* 98 = linux_connect */ + { AS(accept_args), (sy_call_t *)oaccept, AUE_ACCEPT }, /* 99 = accept */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 100 = osf_getpriority */ - { AS(osend_args), (sy_call_t *)osend, AUE_NULL }, /* 101 = osend */ - { AS(orecv_args), (sy_call_t *)orecv, AUE_NULL }, /* 102 = orecv */ - { SYF_MPSAFE | AS(osf1_sigreturn_args), (sy_call_t *)osf1_sigreturn, AUE_NULL }, /* 103 = osf1_sigreturn */ - { AS(bind_args), (sy_call_t *)bind, AUE_NULL }, /* 104 = bind */ - { AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_NULL }, /* 105 = setsockopt */ - { AS(listen_args), (sy_call_t *)listen, AUE_NULL }, /* 106 = listen */ + { AS(osend_args), (sy_call_t *)osend, AUE_SEND }, /* 101 = osend */ + { AS(orecv_args), (sy_call_t *)orecv, AUE_RECV }, /* 102 = orecv */ + { SYF_MPSAFE | AS(osf1_sigreturn_args), (sy_call_t *)osf1_sigreturn, AUE_SIGRETURN }, /* 103 = osf1_sigreturn */ + { AS(bind_args), (sy_call_t *)bind, AUE_BIND }, /* 104 = bind */ + { AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT }, /* 105 = setsockopt */ + { AS(listen_args), (sy_call_t *)listen, AUE_LISTEN }, /* 106 = listen */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 107 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 108 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 109 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 110 = */ - { SYF_MPSAFE | AS(osf1_sigsuspend_args), (sy_call_t *)osf1_sigsuspend, AUE_NULL }, /* 111 = osf1_sigsuspend */ + { SYF_MPSAFE | AS(osf1_sigsuspend_args), (sy_call_t *)osf1_sigsuspend, AUE_SIGSUSEND }, /* 111 = osf1_sigsuspend */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 112 = osf_sigstack */ - { 0, (sy_call_t *)linux_recvmsg, AUE_NULL }, /* 113 = linux_recvmsg */ - { 0, (sy_call_t *)linux_sendmsg, AUE_NULL }, /* 114 = linux_sendmsg */ + { 0, (sy_call_t *)linux_recvmsg, AUE_RECVMSG }, /* 113 = linux_recvmsg */ + { 0, (sy_call_t *)linux_sendmsg, AUE_SENDMSG }, /* 114 = linux_sendmsg */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 115 = */ - { SYF_MPSAFE | AS(osf1_gettimeofday_args), (sy_call_t *)osf1_gettimeofday, AUE_NULL }, /* 116 = osf1_gettimeofday */ - { AS(osf1_getrusage_args), (sy_call_t *)osf1_getrusage, AUE_NULL }, /* 117 = osf1_getrusage */ - { AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_NULL }, /* 118 = getsockopt */ + { SYF_MPSAFE | AS(osf1_gettimeofday_args), (sy_call_t *)osf1_gettimeofday, AUE_GETTIMEOFDAY }, /* 116 = osf1_gettimeofday */ + { AS(osf1_getrusage_args), (sy_call_t *)osf1_getrusage, AUE_GETRUSAGE }, /* 117 = osf1_getrusage */ + { AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_GETSOCKOPT }, /* 118 = getsockopt */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 119 = */ - { AS(readv_args), (sy_call_t *)readv, AUE_NULL }, /* 120 = readv */ - { AS(writev_args), (sy_call_t *)writev, AUE_NULL }, /* 121 = writev */ + { AS(readv_args), (sy_call_t *)readv, AUE_READV }, /* 120 = readv */ + { AS(writev_args), (sy_call_t *)writev, AUE_WRITEV }, /* 121 = writev */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 122 = osf_settimeofday */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 123 = fchown */ - { AS(fchmod_args), (sy_call_t *)fchmod, AUE_NULL }, /* 124 = fchmod */ - { AS(recvfrom_args), (sy_call_t *)orecvfrom, AUE_NULL }, /* 125 = recvfrom */ - { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_NULL }, /* 126 = setreuid */ - { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_NULL }, /* 127 = setregid */ - { AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_NULL }, /* 128 = linux_rename */ - { AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_NULL }, /* 129 = linux_truncate */ - { AS(oftruncate_args), (sy_call_t *)oftruncate, AUE_NULL }, /* 130 = oftruncate */ - { AS(flock_args), (sy_call_t *)flock, AUE_NULL }, /* 131 = flock */ - { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_NULL }, /* 132 = setgid */ - { AS(osf1_sendto_args), (sy_call_t *)osf1_sendto, AUE_NULL }, /* 133 = osf1_sendto */ - { AS(shutdown_args), (sy_call_t *)shutdown, AUE_NULL }, /* 134 = shutdown */ - { 0, (sy_call_t *)linux_socketpair, AUE_NULL }, /* 135 = linux_socketpair */ - { AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_NULL }, /* 136 = linux_mkdir */ - { AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_NULL }, /* 137 = linux_rmdir */ - { AS(utimes_args), (sy_call_t *)utimes, AUE_NULL }, /* 138 = utimes */ + { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 123 = fchown */ + { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 124 = fchmod */ + { AS(recvfrom_args), (sy_call_t *)orecvfrom, AUE_RECVFROM }, /* 125 = recvfrom */ + { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 126 = setreuid */ + { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 127 = setregid */ + { AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME }, /* 128 = linux_rename */ + { AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 129 = linux_truncate */ + { AS(oftruncate_args), (sy_call_t *)oftruncate, AUE_FTRUNCATE }, /* 130 = oftruncate */ + { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 131 = flock */ + { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 132 = setgid */ + { AS(osf1_sendto_args), (sy_call_t *)osf1_sendto, AUE_SENDTO }, /* 133 = osf1_sendto */ + { AS(shutdown_args), (sy_call_t *)shutdown, AUE_SHUTDOWN }, /* 134 = shutdown */ + { 0, (sy_call_t *)linux_socketpair, AUE_SOCKETPAIR }, /* 135 = linux_socketpair */ + { AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR }, /* 136 = linux_mkdir */ + { AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR }, /* 137 = linux_rmdir */ + { AS(utimes_args), (sy_call_t *)utimes, AUE_UTIMES }, /* 138 = utimes */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 139 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 140 = */ - { AS(ogetpeername_args), (sy_call_t *)ogetpeername, AUE_NULL }, /* 141 = ogetpeername */ + { AS(ogetpeername_args), (sy_call_t *)ogetpeername, AUE_GETPEERNAME }, /* 141 = ogetpeername */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 142 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 143 = */ - { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_NULL }, /* 144 = linux_getrlimit */ - { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_NULL }, /* 145 = linux_setrlimit */ + { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT }, /* 144 = linux_getrlimit */ + { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT }, /* 145 = linux_setrlimit */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 146 = */ - { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_NULL }, /* 147 = setsid */ - { 0, (sy_call_t *)linux_quotactl, AUE_NULL }, /* 148 = linux_quotactl */ + { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_SETSID }, /* 147 = setsid */ + { 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL }, /* 148 = linux_quotactl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 149 = */ - { AS(getsockname_args), (sy_call_t *)ogetsockname, AUE_NULL }, /* 150 = getsockname */ + { AS(getsockname_args), (sy_call_t *)ogetsockname, AUE_GETSOCKNAME }, /* 150 = getsockname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 151 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 152 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 153 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 154 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 155 = */ - { SYF_MPSAFE | AS(osf1_sigaction_args), (sy_call_t *)osf1_sigaction, AUE_NULL }, /* 156 = osf1_sigaction */ + { SYF_MPSAFE | AS(osf1_sigaction_args), (sy_call_t *)osf1_sigaction, AUE_SIGCTION }, /* 156 = osf1_sigaction */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 157 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 158 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 159 = osf_getdirentries */ @@ -186,7 +186,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 163 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 164 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 165 = osf_getdomainname */ - { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_NULL }, /* 166 = setdomainname */ + { SYF_MPSAFE | AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_O_GETDOMAINNAME }, /* 166 = setdomainname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 167 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 168 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 169 = */ @@ -220,24 +220,24 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 197 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 198 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 199 = osf_swapon */ - { AS(linux_msgctl_args), (sy_call_t *)linux_msgctl, AUE_NULL }, /* 200 = linux_msgctl */ - { AS(linux_msgget_args), (sy_call_t *)linux_msgget, AUE_NULL }, /* 201 = linux_msgget */ - { AS(linux_msgrcv_args), (sy_call_t *)linux_msgrcv, AUE_NULL }, /* 202 = linux_msgrcv */ - { AS(linux_msgsnd_args), (sy_call_t *)linux_msgsnd, AUE_NULL }, /* 203 = linux_msgsnd */ - { AS(linux_semctl_args), (sy_call_t *)linux_semctl, AUE_NULL }, /* 204 = linux_semctl */ - { AS(linux_semget_args), (sy_call_t *)linux_semget, AUE_NULL }, /* 205 = linux_semget */ - { AS(linux_semop_args), (sy_call_t *)linux_semop, AUE_NULL }, /* 206 = linux_semop */ + { AS(linux_msgctl_args), (sy_call_t *)linux_msgctl, AUE_MSGCTL }, /* 200 = linux_msgctl */ + { AS(linux_msgget_args), (sy_call_t *)linux_msgget, AUE_MSGGET }, /* 201 = linux_msgget */ + { AS(linux_msgrcv_args), (sy_call_t *)linux_msgrcv, AUE_MSGRCV }, /* 202 = linux_msgrcv */ + { AS(linux_msgsnd_args), (sy_call_t *)linux_msgsnd, AUE_MSGSND }, /* 203 = linux_msgsnd */ + { AS(linux_semctl_args), (sy_call_t *)linux_semctl, AUE_SEMCTL }, /* 204 = linux_semctl */ + { AS(linux_semget_args), (sy_call_t *)linux_semget, AUE_SEMGET }, /* 205 = linux_semget */ + { AS(linux_semop_args), (sy_call_t *)linux_semop, AUE_SEMOP }, /* 206 = linux_semop */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 207 = osf_utsname */ - { AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_NULL }, /* 208 = linux_lchown */ - { AS(linux_shmat_args), (sy_call_t *)linux_shmat, AUE_NULL }, /* 209 = linux_shmat */ - { AS(linux_shmctl_args), (sy_call_t *)linux_shmctl, AUE_NULL }, /* 210 = linux_shmctl */ - { AS(linux_shmdt_args), (sy_call_t *)linux_shmdt, AUE_NULL }, /* 211 = linux_shmdt */ - { AS(linux_shmget_args), (sy_call_t *)linux_shmget, AUE_NULL }, /* 212 = linux_shmget */ + { AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN }, /* 208 = linux_lchown */ + { AS(linux_shmat_args), (sy_call_t *)linux_shmat, AUE_SHMAT }, /* 209 = linux_shmat */ + { AS(linux_shmctl_args), (sy_call_t *)linux_shmctl, AUE_SHMCTL }, /* 210 = linux_shmctl */ + { AS(linux_shmdt_args), (sy_call_t *)linux_shmdt, AUE_SHMDT }, /* 211 = linux_shmdt */ + { AS(linux_shmget_args), (sy_call_t *)linux_shmget, AUE_SHMGET }, /* 212 = linux_shmget */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 213 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 214 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 215 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 216 = */ - { AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_NULL }, /* 217 = linux_msync */ + { AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC }, /* 217 = linux_msync */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 218 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 219 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 220 = */ @@ -253,9 +253,9 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 230 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 231 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 232 = */ - { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_NULL }, /* 233 = getpgid */ - { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_NULL }, /* 234 = linux_getsid */ - { 0, (sy_call_t *)linux_sigaltstack, AUE_NULL }, /* 235 = linux_sigaltstack */ + { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPPID }, /* 233 = getpgid */ + { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID }, /* 234 = linux_getsid */ + { 0, (sy_call_t *)linux_sigaltstack, AUE_SIGALTSTACK }, /* 235 = linux_sigaltstack */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 236 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 237 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 238 = */ @@ -322,80 +322,80 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 299 = */ { 0, (sy_call_t *)linux_bdflush, AUE_NULL }, /* 300 = linux_bdflush */ { 0, (sy_call_t *)linux_sethae, AUE_NULL }, /* 301 = linux_sethae */ - { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_NULL }, /* 302 = linux_mount */ - { 0, (sy_call_t *)linux_old_adjtimex, AUE_NULL }, /* 303 = linux_old_adjtimex */ - { 0, (sy_call_t *)linux_swapoff, AUE_NULL }, /* 304 = linux_swapoff */ - { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_NULL }, /* 305 = linux_getdents */ + { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT }, /* 302 = linux_mount */ + { 0, (sy_call_t *)linux_old_adjtimex, AUE_ADJTIME }, /* 303 = linux_old_adjtimex */ + { 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF }, /* 304 = linux_swapoff */ + { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS }, /* 305 = linux_getdents */ { 0, (sy_call_t *)linux_create_module, AUE_NULL }, /* 306 = linux_create_module */ { 0, (sy_call_t *)linux_init_module, AUE_NULL }, /* 307 = linux_init_module */ { 0, (sy_call_t *)linux_delete_module, AUE_NULL }, /* 308 = linux_delete_module */ { 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL }, /* 309 = linux_get_kernel_syms */ { AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL }, /* 310 = linux_syslog */ - { AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_NULL }, /* 311 = linux_reboot */ - { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_NULL }, /* 312 = linux_clone */ + { AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT }, /* 311 = linux_reboot */ + { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK }, /* 312 = linux_clone */ { AS(linux_uselib_args), (sy_call_t *)linux_uselib, AUE_NULL }, /* 313 = linux_uselib */ - { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_NULL }, /* 314 = mlock */ - { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_NULL }, /* 315 = munlock */ - { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_NULL }, /* 316 = mlockall */ - { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_NULL }, /* 317 = munlockall */ + { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK }, /* 314 = mlock */ + { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK }, /* 315 = munlock */ + { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL }, /* 316 = mlockall */ + { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL }, /* 317 = munlockall */ { 0, (sy_call_t *)linux_sysinfo, AUE_NULL }, /* 318 = linux_sysinfo */ - { AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_NULL }, /* 319 = linux_sysctl */ + { AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL }, /* 319 = linux_sysctl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 320 = sys_idle */ - { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_NULL }, /* 321 = linux_oldumount */ - { AS(swapon_args), (sy_call_t *)swapon, AUE_NULL }, /* 322 = swapon */ + { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT }, /* 321 = linux_oldumount */ + { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 322 = swapon */ { AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 323 = linux_times */ { AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_NULL }, /* 324 = linux_personality */ { AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_NULL }, /* 325 = linux_setfsuid */ { AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_NULL }, /* 326 = linux_setfsgid */ { AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL }, /* 327 = linux_ustat */ - { AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_NULL }, /* 328 = linux_statfs */ - { AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_NULL }, /* 329 = linux_fstatfs */ + { AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS }, /* 328 = linux_statfs */ + { AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS }, /* 329 = linux_fstatfs */ { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL }, /* 330 = sched_setparam */ { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL }, /* 331 = sched_getparam */ { SYF_MPSAFE | AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_NULL }, /* 332 = linux_sched_setscheduler */ { SYF_MPSAFE | AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_NULL }, /* 333 = linux_sched_getscheduler */ { SYF_MPSAFE | 0, (sy_call_t *)sched_yield, AUE_NULL }, /* 334 = sched_yield */ - { SYF_MPSAFE | AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_NULL }, /* 335 = linux_sched_get_priority_max */ - { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_NULL }, /* 336 = linux_sched_get_priority_min */ + { SYF_MPSAFE | AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_GETPRIORITY }, /* 335 = linux_sched_get_priority_max */ + { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_GETPRIORITY }, /* 336 = linux_sched_get_priority_min */ { AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_NULL }, /* 337 = sched_rr_get_interval */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 338 = sys_afs_syscall */ { AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL }, /* 339 = linux_newuname */ { SYF_MPSAFE | AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL }, /* 340 = nanosleep */ { AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL }, /* 341 = linux_mremap */ { 0, (sy_call_t *)linux_nfsservctl, AUE_NULL }, /* 342 = linux_nfsservctl */ - { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_NULL }, /* 343 = setresuid */ - { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_NULL }, /* 344 = getresuid */ + { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID }, /* 343 = setresuid */ + { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID }, /* 344 = getresuid */ { 0, (sy_call_t *)linux_pciconfig_read, AUE_NULL }, /* 345 = linux_pciconfig_read */ { 0, (sy_call_t *)linux_pciconfig_write, AUE_NULL }, /* 346 = linux_pciconfig_write */ { 0, (sy_call_t *)linux_query_module, AUE_NULL }, /* 347 = linux_query_module */ { 0, (sy_call_t *)linux_prctl, AUE_NULL }, /* 348 = linux_prctl */ - { AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_NULL }, /* 349 = linux_pread */ - { AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_NULL }, /* 350 = linux_pwrite */ - { 0, (sy_call_t *)linux_rt_sigreturn, AUE_NULL }, /* 351 = linux_rt_sigreturn */ - { SYF_MPSAFE | AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL }, /* 352 = linux_rt_sigaction */ - { SYF_MPSAFE | AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL }, /* 353 = linux_rt_sigprocmask */ - { 0, (sy_call_t *)linux_rt_sigpending, AUE_NULL }, /* 354 = linux_rt_sigpending */ - { 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL }, /* 355 = linux_rt_sigtimedwait */ + { AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD }, /* 349 = linux_pread */ + { AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE }, /* 350 = linux_pwrite */ + { 0, (sy_call_t *)linux_rt_sigreturn, AUE_SIGRETURN }, /* 351 = linux_rt_sigreturn */ + { SYF_MPSAFE | AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_SIGACTION }, /* 352 = linux_rt_sigaction */ + { SYF_MPSAFE | AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_SIGPROCMASK }, /* 353 = linux_rt_sigprocmask */ + { 0, (sy_call_t *)linux_rt_sigpending, AUE_SIGPENDING }, /* 354 = linux_rt_sigpending */ + { 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_SIGWAIT }, /* 355 = linux_rt_sigtimedwait */ { 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL }, /* 356 = linux_rt_sigqueueinfo */ - { SYF_MPSAFE | AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL }, /* 357 = linux_rt_sigsuspend */ - { AS(linux_select_args), (sy_call_t *)linux_select, AUE_NULL }, /* 358 = linux_select */ - { SYF_MPSAFE | AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_NULL }, /* 359 = gettimeofday */ - { SYF_MPSAFE | AS(settimeofday_args), (sy_call_t *)settimeofday, AUE_NULL }, /* 360 = settimeofday */ - { SYF_MPSAFE | AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_NULL }, /* 361 = linux_getitimer */ - { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_NULL }, /* 362 = linux_setitimer */ - { AS(linux_utimes_args), (sy_call_t *)linux_utimes, AUE_NULL }, /* 363 = linux_utimes */ - { SYF_MPSAFE | AS(getrusage_args), (sy_call_t *)getrusage, AUE_NULL }, /* 364 = getrusage */ - { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_NULL }, /* 365 = linux_wait4 */ - { 0, (sy_call_t *)linux_adjtimex, AUE_NULL }, /* 366 = linux_adjtimex */ + { SYF_MPSAFE | AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_SIGSUSPEND }, /* 357 = linux_rt_sigsuspend */ + { AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT }, /* 358 = linux_select */ + { SYF_MPSAFE | AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_GETTMEOFDAY }, /* 359 = gettimeofday */ + { SYF_MPSAFE | AS(settimeofday_args), (sy_call_t *)settimeofday, AUE_SETTIMEOFDAY }, /* 360 = settimeofday */ + { SYF_MPSAFE | AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER }, /* 361 = linux_getitimer */ + { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER }, /* 362 = linux_setitimer */ + { AS(linux_utimes_args), (sy_call_t *)linux_utimes, AUE_UTIMES }, /* 363 = linux_utimes */ + { SYF_MPSAFE | AS(getrusage_args), (sy_call_t *)getrusage, AUE_GETRUSAGE }, /* 364 = getrusage */ + { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_O_WAIT }, /* 365 = linux_wait4 */ + { 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIMEULL }, /* 366 = linux_adjtimex */ { AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_NULL }, /* 367 = linux_getcwd */ { 0, (sy_call_t *)linux_capget, AUE_NULL }, /* 368 = linux_capget */ { 0, (sy_call_t *)linux_capset, AUE_NULL }, /* 369 = linux_capset */ { 0, (sy_call_t *)linux_sendfile, AUE_NULL }, /* 370 = linux_sendfile */ - { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_NULL }, /* 371 = setresgid */ - { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_NULL }, /* 372 = getresgid */ + { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID }, /* 371 = setresgid */ + { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID }, /* 372 = getresgid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 373 = sys_dipc */ { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_NULL }, /* 374 = linux_pivot_root */ - { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_NULL }, /* 375 = linux_mincore */ + { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE }, /* 375 = linux_mincore */ { 0, (sy_call_t *)linux_pciconfig_iobase, AUE_NULL }, /* 376 = linux_pciconfig_iobase */ - { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_NULL }, /* 377 = linux_getdents64 */ + { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS }, /* 377 = linux_getdents64 */ }; ==== //depot/projects/trustedbsd/audit3/sys/alpha/linux/syscalls.master#4 (text+ko) ==== @@ -46,212 +46,213 @@ ; #ifdef's, etc. may be included, and are copied to the output files. 0 AUE_NULL UNIMPL -1 AUE_NULL MNOPROTO { void sys_exit(int rval); } exit \ +1 AUE_EXIT MNOPROTO { void sys_exit(int rval); } exit \ sys_exit_args void -2 AUE_NULL MSTD { int linux_fork(void); } +2 AUE_FORK MSTD { int linux_fork(void); } 3 AUE_NULL MNOPROTO { int read(int fd, char *buf, \ u_int nbyte); } 4 AUE_NULL MNOPROTO { int write(int fd, char *buf, \ u_int nbyte); } 5 AUE_NULL UNIMPL -6 AUE_NULL MNOPROTO { int close(int fd); } -7 AUE_NULL MSTD { int osf1_wait4(int pid, int *status, \ +6 AUE_CLOSE MNOPROTO { int close(int fd); } +7 AUE_O_WAIT MSTD { int osf1_wait4(int pid, int *status, \ int options, \ struct osf1_rusage *rusage); } 8 AUE_NULL UNIMPL -9 AUE_NULL STD { int linux_link(char *path, char *to); } -10 AUE_NULL STD { int linux_unlink(char *path); } +9 AUE_LINK STD { int linux_link(char *path, char *to); } +10 AUE_UNLINK STD { int linux_unlink(char *path); } 11 AUE_NULL UNIMPL -12 AUE_NULL STD { int linux_chdir(char *path); } -13 AUE_NULL NOPROTO { int fchdir(int fd); } -14 AUE_NULL STD { int linux_mknod(char *path, l_int mode, \ +12 AUE_CHDIR STD { int linux_chdir(char *path); } +13 AUE_FCHDIR NOPROTO { int fchdir(int fd); } +14 AUE_MKNOD STD { int linux_mknod(char *path, l_int mode, \ l_dev_t dev); } -15 AUE_NULL STD { int linux_chmod(char *path, \ +15 AUE_CHMOD STD { int linux_chmod(char *path, \ l_mode_t mode); } -16 AUE_NULL STD { int linux_chown(char *path, l_uid_t uid, \ +16 AUE_CHOWN STD { int linux_chown(char *path, l_uid_t uid, \ l_gid_t gid); } 17 AUE_NULL STD { int linux_brk(l_ulong dsend); } 18 AUE_NULL UNIMPL -19 AUE_NULL STD { int linux_lseek(l_uint fdes, l_off_t off, \ +19 AUE_LSEEK STD { int linux_lseek(l_uint fdes, l_off_t off, \ l_int whence); } -20 AUE_NULL NOPROTO { int getpid(void); } -21 AUE_NULL UNIMPL osf1_mount -22 AUE_NULL STD { int linux_umount(char *path, l_int flags); } -23 AUE_NULL MNOPROTO { int setuid(uid_t uid); } -24 AUE_NULL MNOPROTO { int getuid(void); } +20 AUE_GETPID NOPROTO { int getpid(void); } +21 AUE_MOUNT UNIMPL osf1_mount +22 AUE_UNMOUNT STD { int linux_umount(char *path, l_int flags); } +23 AUE_SETUID MNOPROTO { int setuid(uid_t uid); } +24 AUE_GETUID MNOPROTO { int getuid(void); } 25 AUE_NULL UNIMPL -26 AUE_NULL MSTD { int linux_ptrace(void); } +26 AUE_PTRACE MSTD { int linux_ptrace(void); } 27 AUE_NULL UNIMPL 28 AUE_NULL UNIMPL 29 AUE_NULL UNIMPL 30 AUE_NULL UNIMPL 31 AUE_NULL UNIMPL 32 AUE_NULL UNIMPL -33 AUE_NULL STD { int linux_access(char *path, l_int flags); } +33 AUE_ACCESS STD { int linux_access(char *path, l_int flags); } 34 AUE_NULL UNIMPL 35 AUE_NULL UNIMPL -36 AUE_NULL NOPROTO { int sync(void); } -37 AUE_NULL MSTD { int linux_kill(l_int pid, l_int signum); } +36 AUE_SYNC NOPROTO { int sync(void); } +37 AUE_KILL MSTD { int linux_kill(l_int pid, l_int signum); } 38 AUE_NULL UNIMPL -39 AUE_NULL MNOPROTO { int setpgid(int pid, int pgid); } +39 AUE_SETPGRP MNOPROTO { int setpgid(int pid, int pgid); } 40 AUE_NULL UNIMPL -41 AUE_NULL MNOPROTO { int dup(u_int fd); } -42 AUE_NULL MNOPROTO { int pipe(void); } +41 AUE_DUP MNOPROTO { int dup(u_int fd); } +42 AUE_PIPE MNOPROTO { int pipe(void); } 43 AUE_NULL UNIMPL osf_set_program_attributes 44 AUE_NULL UNIMPL -45 AUE_NULL STD { int linux_open(char *path, l_int flags, \ +45 AUE_OPEN_RWTC STD { int linux_open(char *path, l_int flags, \ l_int mode); } 46 AUE_NULL UNIMPL -47 AUE_NULL MNOPROTO { int getgid(void); } -48 AUE_NULL MSTD { int osf1_sigprocmask(int how, \ +47 AUE_GETGID MNOPROTO { int getgid(void); } +48 AUE_SIGPROCMASK MSTD { int osf1_sigprocmask(int how, \ u_long mask); } 49 AUE_NULL UNIMPL 50 AUE_NULL UNIMPL -51 AUE_NULL NOPROTO { int acct(char *path); } -52 AUE_NULL MSTD { int linux_sigpending(void); } +51 AUE_ACCT NOPROTO { int acct(char *path); } +52 AUE_SIGPENDING MSTD { int linux_sigpending(void); } 53 AUE_NULL UNIMPL -54 AUE_NULL STD { int linux_ioctl(l_uint fd, l_uint cmd, \ +54 AUE_IOCTL STD { int linux_ioctl(l_uint fd, l_uint cmd, \ l_ulong arg); } 55 AUE_NULL UNIMPL 56 AUE_NULL UNIMPL -57 AUE_NULL STD { int linux_symlink(char *path, char *to); } -58 AUE_NULL STD { int linux_readlink(char *name, char *buf, \ +57 AUE_SYMLINK STD { int linux_symlink(char *path, char *to); } +58 AUE_READLINK STD { int linux_readlink(char *name, char *buf, \ l_int count); } -59 AUE_NULL STD { int linux_execve(char *path, char **argp, \ +59 AUE_EXECVE STD { int linux_execve(char *path, char **argp, \ char **envp); } -60 AUE_NULL MNOPROTO { int umask(int newmask); } -61 AUE_NULL NOPROTO { int chroot(char *path); } +60 AUE_UMASK MNOPROTO { int umask(int newmask); } +61 AUE_CHROOT NOPROTO { int chroot(char *path); } 62 AUE_NULL UNIMPL -63 AUE_NULL MNOPROTO { int getpgrp(void); } -64 AUE_NULL STD { int linux_getpagesize(void); } +63 AUE_GETPGRP MNOPROTO { int getpgrp(void); } +64 AUE_O_GETPAGESIZE STD { int linux_getpagesize(void); } 65 AUE_NULL UNIMPL -66 AUE_NULL MSTD { int linux_vfork(void); } -67 AUE_NULL STD { int linux_newstat(char *path, \ +66 AUE_VFORK MSTD { int linux_vfork(void); } +67 AUE_STAT STD { int linux_newstat(char *path, \ struct l_newstat *buf); } -68 AUE_NULL STD { int linux_newlstat(char *path, \ +68 AUE_LSTAT STD { int linux_newlstat(char *path, \ struct l_newstat *buf); } 69 AUE_NULL UNIMPL 70 AUE_NULL UNIMPL -71 AUE_NULL STD { int linux_mmap(l_ulong addr, l_ulong len, \ +71 AUE_MMAP STD { int linux_mmap(l_ulong addr, l_ulong len, \ l_ulong prot, l_ulong flags, l_ulong fd, \ l_ulong pos); } 72 AUE_NULL UNIMPL -73 AUE_NULL STD { int linux_munmap(l_ulong addr, \ +73 AUE_MUNMAP STD { int linux_munmap(l_ulong addr, \ l_size_t len); } -74 AUE_NULL STD { int linux_mprotect(l_ulong addr, \ +74 AUE_MPROTECT STD { int linux_mprotect(l_ulong addr, \ l_size_t len, l_ulong prot); } -75 AUE_NULL MNOPROTO { int madvise(void *addr, \ +75 AUE_MADVISE MNOPROTO { int madvise(void *addr, \ size_t len, int behav); } 76 AUE_NULL STD { int linux_vhangup(void); } 77 AUE_NULL UNIMPL 78 AUE_NULL UNIMPL -79 AUE_NULL MSTD { int linux_setgroups(l_int gidsetsize, \ +79 AUE_SETGROUPS MSTD { int linux_setgroups(l_int gidsetsize, \ l_gid_t *grouplist); } -80 AUE_NULL MSTD { int linux_getgroups(l_int gidsetsize, \ +80 AUE_GETGROUPS MSTD { int linux_getgroups(l_int gidsetsize, \ l_gid_t *grouplist); } 81 AUE_NULL UNIMPL -82 AUE_NULL MNODEF setpgid setpgid setpgid_args int -83 AUE_NULL STD { int osf1_setitimer(u_int which, \ +82 AUE_SETPGRP MNODEF setpgid setpgid setpgid_args int +83 AUE_SETITIMER STD { int osf1_setitimer(u_int which, \ struct itimerval *itv, \ struct itimerval *oitv); } 84 AUE_NULL UNIMPL 85 AUE_NULL UNIMPL -86 AUE_NULL UNIMPL osf_getitimer -87 AUE_NULL STD { int linux_gethostname(void); } -88 AUE_NULL MNOPROTO { int osethostname(char *hostname, \ - u_int len); } osethostname \ - sethostname_args int -89 AUE_NULL STD { int linux_getdtablesize(void); } -90 AUE_NULL MNOPROTO { int dup2(u_int from, u_int to); } -91 AUE_NULL STD { int linux_newfstat(l_uint fd, \ +86 AUE_GETITIMER UNIMPL osf_getitimer +87 AUE_O_GETHOSTNAME STD { int linux_gethostname(void); } +88 AUE_O_SETHOTNAME MNOPROTO { int osethostname( \ + char *hostname, u_int len); } \ + osethostname sethostname_args int +89 AUE_GETDTABLESIZE STD { int linux_getdtablesize(void); } +90 AUE_DUP2 MNOPROTO { int dup2(u_int from, u_int to); } +91 AUE_FSTAT STD { int linux_newfstat(l_uint fd, \ struct l_newstat *buf); } -92 AUE_NULL MSTD { int linux_fcntl(l_uint fd, l_uint cmd, \ +92 AUE_FCNTL MSTD { int linux_fcntl(l_uint fd, l_uint cmd, \ l_ulong arg); } -93 AUE_NULL STD { int osf1_select(u_int nd, fd_set *in, \ +93 AUE_SELECT STD { int osf1_select(u_int nd, fd_set *in, \ fd_set *ou, fd_set *ex, \ struct timeval *tv); } -94 AUE_NULL NOPROTO { int poll(struct pollfd*, unsigned int \ +94 AUE_POLL NOPROTO { int poll(struct pollfd*, unsigned int \ nfds, long timeout); } -95 AUE_NULL NOPROTO { int fsync(int fd); } -96 AUE_NULL MNOPROTO { int setpriority(int which, \ +95 AUE_FSYNC NOPROTO { int fsync(int fd); } +96 AUE_SETPRIORITY MNOPROTO { int setpriority(int which, \ int who, int prio); } -97 AUE_NULL STD { int osf1_socket(int domain, int type, \ +97 AUE_SOCKET STD { int osf1_socket(int domain, int type, \ int protocol); } -98 AUE_NULL STD { int linux_connect(l_int s, \ +98 AUE_CONNECT STD { int linux_connect(l_int s, \ struct l_sockaddr *name, l_int namelen); } -99 AUE_NULL NOPROTO { int oaccept(int s, caddr_t name, \ +99 AUE_ACCEPT NOPROTO { int oaccept(int s, caddr_t name, \ int *anamelen); } accept accept_args int -100 AUE_NULL UNIMPL osf_getpriority -101 AUE_NULL NOPROTO { int osend(int s, caddr_t buf, int len, \ +100 AUE_GETPRIORITY UNIMPL osf_getpriority +101 AUE_SEND NOPROTO { int osend(int s, caddr_t buf, int len, \ int flags); } -102 AUE_NULL NOPROTO { int orecv(int s, caddr_t buf, int len, \ +102 AUE_RECV NOPROTO { int orecv(int s, caddr_t buf, int len, \ int flags); } -103 AUE_NULL MSTD { int osf1_sigreturn( \ +103 AUE_SIGRETURN MSTD { int osf1_sigreturn( \ struct osigcontext *sigcntxp); } -104 AUE_NULL NOPROTO { int bind(int s, caddr_t name, \ +104 AUE_BIND NOPROTO { int bind(int s, caddr_t name, \ int namelen); } -105 AUE_NULL NOPROTO { int setsockopt(int s, int level, int name, \ +105 AUE_SETSOCKOPT NOPROTO { int setsockopt(int s, int level, int name, \ caddr_t val, int valsize); } -106 AUE_NULL NOPROTO { int listen(int s, int backlog); } +106 AUE_LISTEN NOPROTO { int listen(int s, int backlog); } 107 AUE_NULL UNIMPL 108 AUE_NULL UNIMPL 109 AUE_NULL UNIMPL 110 AUE_NULL UNIMPL -111 AUE_NULL MSTD { int osf1_sigsuspend(unsigned long ss); } -112 AUE_NULL UNIMPL osf_sigstack -113 AUE_NULL STD { int linux_recvmsg(void); } -114 AUE_NULL STD { int linux_sendmsg(void); } +111 AUE_SIGSUSEND MSTD { int osf1_sigsuspend(unsigned long ss); } +112 AUE_O_SIGSTACK UNIMPL osf_sigstack +113 AUE_RECVMSG STD { int linux_recvmsg(void); } +114 AUE_SENDMSG STD { int linux_sendmsg(void); } 115 AUE_NULL UNIMPL -116 AUE_NULL MSTD { int osf1_gettimeofday(struct timeval *tp, \ +116 AUE_GETTIMEOFDAY MSTD { int osf1_gettimeofday( \ + struct timeval *tp, \ struct timezone *tzp); } -117 AUE_NULL STD { int osf1_getrusage(long who, \ +117 AUE_GETRUSAGE STD { int osf1_getrusage(long who, \ void *rusage); } -118 AUE_NULL NOPROTO { int getsockopt(int s, int level, int name, \ +118 AUE_GETSOCKOPT NOPROTO { int getsockopt(int s, int level, int name, \ caddr_t val, int *avalsize); } 119 AUE_NULL UNIMPL -120 AUE_NULL NOPROTO { int readv(int fd, struct iovec *iovp, \ +120 AUE_READV NOPROTO { int readv(int fd, struct iovec *iovp, \ u_int iovcnt); } -121 AUE_NULL NOPROTO { int writev(int fd, struct iovec *iovp, \ +121 AUE_WRITEV NOPROTO { int writev(int fd, struct iovec *iovp, \ u_int iovcnt); } -122 AUE_NULL UNIMPL osf_settimeofday -123 AUE_NULL NOPROTO { int fchown(int fd, int uid, int gid); } -124 AUE_NULL NOPROTO { int fchmod(int fd, int mode); } -125 AUE_NULL NOPROTO { int orecvfrom(int s, caddr_t buf, \ +122 AUE_SETTIMEOFDAY UNIMPL osf_settimeofday +123 AUE_FCHOWN NOPROTO { int fchown(int fd, int uid, int gid); } +124 AUE_FCHMOD NOPROTO { int fchmod(int fd, int mode); } +125 AUE_RECVFROM NOPROTO { int orecvfrom(int s, caddr_t buf, \ size_t len, int flags, caddr_t from, \ int *fromlenaddr); } recvfrom \ recvfrom_args int -126 AUE_NULL MNOPROTO { int setreuid(int ruid, int euid); } -127 AUE_NULL MNOPROTO { int setregid(int rgid, int egid); } -128 AUE_NULL STD { int linux_rename(char *from, char *to); } -129 AUE_NULL STD { int linux_truncate(char *path, \ +126 AUE_SETREUID MNOPROTO { int setreuid(int ruid, int euid); } +127 AUE_SETREGID MNOPROTO { int setregid(int rgid, int egid); } +128 AUE_RENAME STD { int linux_rename(char *from, char *to); } +129 AUE_TRUNCATE STD { int linux_truncate(char *path, \ l_ulong length); } -130 AUE_NULL NOPROTO { int oftruncate(int fd, long length); } -131 AUE_NULL NOPROTO { int flock(int fd, int how); } -132 AUE_NULL MNOPROTO { int setgid(gid_t gid); } -133 AUE_NULL STD { int osf1_sendto(int s, caddr_t buf, \ +130 AUE_FTRUNCATE NOPROTO { int oftruncate(int fd, long length); } +131 AUE_FLOCK NOPROTO { int flock(int fd, int how); } +132 AUE_SETGID MNOPROTO { int setgid(gid_t gid); } +133 AUE_SENDTO STD { int osf1_sendto(int s, caddr_t buf, \ size_t len, int flags, \ struct sockaddr *to, int tolen); } -134 AUE_NULL NOPROTO { int shutdown(int s, int how); } -135 AUE_NULL STD { int linux_socketpair(void); } -136 AUE_NULL STD { int linux_mkdir(char *path, l_int mode); } -137 AUE_NULL STD { int linux_rmdir(char *path); } -138 AUE_NULL NOPROTO { int utimes(char *path, \ +134 AUE_SHUTDOWN NOPROTO { int shutdown(int s, int how); } +135 AUE_SOCKETPAIR STD { int linux_socketpair(void); } +136 AUE_MKDIR STD { int linux_mkdir(char *path, l_int mode); } +137 AUE_RMDIR STD { int linux_rmdir(char *path); } +138 AUE_UTIMES NOPROTO { int utimes(char *path, \ struct timeval *tptr); } 139 AUE_NULL UNIMPL 140 AUE_NULL UNIMPL -141 AUE_NULL NOPROTO { int ogetpeername(int fdes, caddr_t asa, \ +141 AUE_GETPEERNAME NOPROTO { int ogetpeername(int fdes, caddr_t asa, \ int *alen); } 142 AUE_NULL UNIMPL 143 AUE_NULL UNIMPL -144 AUE_NULL MSTD { int linux_getrlimit(l_uint resource, \ +144 AUE_GETRLIMIT MSTD { int linux_getrlimit(l_uint resource, \ struct l_rlimit *rlim); } -145 AUE_NULL MSTD { int linux_setrlimit(l_uint resource, \ +145 AUE_SETRLIMIT MSTD { int linux_setrlimit(l_uint resource, \ struct l_rlimit *rlim); } 146 AUE_NULL UNIMPL -147 AUE_NULL MNOPROTO { int setsid(void); } -148 AUE_NULL STD { int linux_quotactl(void); } +147 AUE_SETSID MNOPROTO { int setsid(void); } +148 AUE_QUOTACTL STD { int linux_quotactl(void); } 149 AUE_NULL UNIMPL -150 AUE_NULL NOPROTO { int ogetsockname(int fdec, caddr_t asa, \ +150 AUE_GETSOCKNAME NOPROTO { int ogetsockname(int fdec, caddr_t asa, \ int *alen);} getsockname \ getsockname_args int 151 AUE_NULL UNIMPL @@ -259,20 +260,20 @@ 153 AUE_NULL UNIMPL 154 AUE_NULL UNIMPL 155 AUE_NULL UNIMPL -156 AUE_NULL MSTD { int osf1_sigaction(int sig, \ +156 AUE_SIGCTION MSTD { int osf1_sigaction(int sig, \ struct osf1_sigaction *nsa, \ struct osf1_sigaction *osa); } 157 AUE_NULL UNIMPL 158 AUE_NULL UNIMPL -159 AUE_NULL UNIMPL osf_getdirentries -160 AUE_NULL UNIMPL osf_statfs -161 AUE_NULL UNIMPL osf_fstatfs +159 AUE_GETDIRENTRIES UNIMPL osf_getdirentries +160 AUE_STATFS UNIMPL osf_statfs +161 AUE_FSTATFS UNIMPL osf_fstatfs 162 AUE_NULL UNIMPL 163 AUE_NULL UNIMPL 164 AUE_NULL UNIMPL -165 AUE_NULL UNIMPL osf_getdomainname -166 AUE_NULL MNOPROTO { int setdomainname(char *name, \ - int len); } +165 AUE_O_GETDOMAINNAME UNIMPL osf_getdomainname +166 AUE_O_GETDOMAINNAME MNOPROTO { int setdomainname( \ + char *name, int len); } 167 AUE_NULL UNIMPL 168 AUE_NULL UNIMPL 169 AUE_NULL UNIMPL @@ -305,39 +306,39 @@ 196 AUE_NULL UNIMPL 197 AUE_NULL UNIMPL 198 AUE_NULL UNIMPL -199 AUE_NULL UNIMPL osf_swapon -200 AUE_NULL STD { int linux_msgctl(l_int msqid, l_int cmd, \ +199 AUE_SWAPON UNIMPL osf_swapon +200 AUE_MSGCTL STD { int linux_msgctl(l_int msqid, l_int cmd, \ struct l_msqid_ds *buf); } -201 AUE_NULL STD { int linux_msgget(l_key_t key, \ +201 AUE_MSGGET STD { int linux_msgget(l_key_t key, \ l_int msgflg); } -202 AUE_NULL STD { int linux_msgrcv(l_int msqid, \ +202 AUE_MSGRCV STD { int linux_msgrcv(l_int msqid, \ struct l_msgbuf *msgp, l_size_t msgsz, \ l_long msgtyp, l_int msgflg); } -203 AUE_NULL STD { int linux_msgsnd(l_int msqid, \ +203 AUE_MSGSND STD { int linux_msgsnd(l_int msqid, \ struct l_msgbuf *msgp, l_size_t msgsz, \ l_int msgflg); } -204 AUE_NULL STD { int linux_semctl(l_int semid, \ +204 AUE_SEMCTL STD { int linux_semctl(l_int semid, \ l_int semnum, l_int cmd, \ union l_semun arg); } -205 AUE_NULL STD { int linux_semget(l_key_t key, l_int nsems, \ +205 AUE_SEMGET STD { int linux_semget(l_key_t key, l_int nsems, \ l_int semflg); } -206 AUE_NULL STD { int linux_semop(l_int semid, \ +206 AUE_SEMOP STD { int linux_semop(l_int semid, \ struct l_sembuf *tsops, l_uint nsops); } 207 AUE_NULL UNIMPL osf_utsname -208 AUE_NULL STD { int linux_lchown(char *path, l_uid_t uid, \ +208 AUE_LCHOWN STD { int linux_lchown(char *path, l_uid_t uid, \ l_gid_t gid); } -209 AUE_NULL STD { int linux_shmat(l_int shmid, \ +209 AUE_SHMAT STD { int linux_shmat(l_int shmid, \ char *shmaddr, l_int shmflg); } -210 AUE_NULL STD { int linux_shmctl(l_int shmid, l_int cmd, \ +210 AUE_SHMCTL STD { int linux_shmctl(l_int shmid, l_int cmd, \ struct l_shmid_ds *buf); } -211 AUE_NULL STD { int linux_shmdt(char *shmaddr); } -212 AUE_NULL STD { int linux_shmget(l_key_t key, \ +211 AUE_SHMDT STD { int linux_shmdt(char *shmaddr); } +212 AUE_SHMGET STD { int linux_shmget(l_key_t key, \ l_size_t size, l_int shmflg); } 213 AUE_NULL UNIMPL 214 AUE_NULL UNIMPL 215 AUE_NULL UNIMPL 216 AUE_NULL UNIMPL -217 AUE_NULL STD { int linux_msync(l_ulong addr, \ +217 AUE_MSYNC STD { int linux_msync(l_ulong addr, \ l_size_t len, l_int fl); } 218 AUE_NULL UNIMPL 219 AUE_NULL UNIMPL @@ -354,9 +355,9 @@ 230 AUE_NULL UNIMPL 231 AUE_NULL UNIMPL 232 AUE_NULL UNIMPL -233 AUE_NULL MNOPROTO { int getpgid(int pid); } -234 AUE_NULL MSTD { int linux_getsid(l_pid_t pid); } -235 AUE_NULL STD { int linux_sigaltstack(void); } +233 AUE_GETPPID MNOPROTO { int getpgid(int pid); } +234 AUE_GETSID MSTD { int linux_getsid(l_pid_t pid); } +235 AUE_SIGALTSTACK STD { int linux_sigaltstack(void); } 236 AUE_NULL UNIMPL 237 AUE_NULL UNIMPL 238 AUE_NULL UNIMPL @@ -429,12 +430,12 @@ 299 AUE_NULL UNIMPL 300 AUE_NULL STD { int linux_bdflush(void); } 301 AUE_NULL STD { int linux_sethae(void); } -302 AUE_NULL STD { int linux_mount(char *specialfile, \ +302 AUE_MOUNT STD { int linux_mount(char *specialfile, \ char *dir, char *filesystemtype, \ l_ulong rwflag, void *data); } -303 AUE_NULL STD { int linux_old_adjtimex(void); } -304 AUE_NULL STD { int linux_swapoff(void); } -305 AUE_NULL STD { int linux_getdents(l_uint fd, void *dent, \ +303 AUE_ADJTIME STD { int linux_old_adjtimex(void); } +304 AUE_SWAPOFF STD { int linux_swapoff(void); } +305 AUE_O_GETDENTS STD { int linux_getdents(l_uint fd, void *dent, \ l_uint count); } 306 AUE_NULL STD { int linux_create_module(void); } 307 AUE_NULL STD { int linux_init_module(void); } @@ -442,31 +443,31 @@ 309 AUE_NULL STD { int linux_get_kernel_syms(void); } 310 AUE_NULL STD { int linux_syslog(l_int type, char *buf, \ l_int len); } -311 AUE_NULL STD { int linux_reboot(l_int magic1, \ +311 AUE_REBOOT STD { int linux_reboot(l_int magic1, \ l_int magic2, l_uint cmd, void *arg); } -312 AUE_NULL MSTD { int linux_clone(l_int flags, void *stack); } +312 AUE_RFORK MSTD { int linux_clone(l_int flags, void *stack); } 313 AUE_NULL STD { int linux_uselib(char *library); } -314 AUE_NULL MNOPROTO { int mlock(const void *addr, \ +314 AUE_MLOCK MNOPROTO { int mlock(const void *addr, \ size_t len); } -315 AUE_NULL MNOPROTO { int munlock(const void *addr, \ +315 AUE_MUNLOCK MNOPROTO { int munlock(const void *addr, \ size_t len); } -316 AUE_NULL MNOPROTO { int mlockall(int how); } -317 AUE_NULL MNOPROTO { int munlockall(void); } +316 AUE_MLOCKALL MNOPROTO { int mlockall(int how); } +317 AUE_MUNLOCKALL MNOPROTO { int munlockall(void); } 318 AUE_NULL STD { int linux_sysinfo(void); } -319 AUE_NULL STD { int linux_sysctl( \ +319 AUE_SYSCTL STD { int linux_sysctl( \ struct l___sysctl_args *args); } 320 AUE_NULL UNIMPL sys_idle -321 AUE_NULL STD { int linux_oldumount(char *path); } -322 AUE_NULL NOPROTO { int swapon(char *name); } +321 AUE_UMOUNT STD { int linux_oldumount(char *path); } +322 AUE_SWAPON NOPROTO { int swapon(char *name); } 323 AUE_NULL STD { int linux_times(struct l_times_argv *buf); } 324 AUE_NULL STD { int linux_personality(l_ulong per); } 325 AUE_NULL STD { int linux_setfsuid(l_uid_t uid); } 326 AUE_NULL STD { int linux_setfsgid(l_gid_t gid); } 327 AUE_NULL STD { int linux_ustat(l_dev_t dev, \ struct l_ustat *ubuf); } -328 AUE_NULL STD { int linux_statfs(char *path, \ +328 AUE_STATFS STD { int linux_statfs(char *path, \ struct l_statfs_buf *buf); } -329 AUE_NULL STD { int linux_fstatfs(l_uint fd, \ +329 AUE_FSTATFS STD { int linux_fstatfs(l_uint fd, \ struct l_statfs_buf *buf); } 330 AUE_NULL MNOPROTO { int sched_setparam(pid_t pid, \ const struct sched_param *param); } @@ -477,9 +478,9 @@ struct l_sched_param *param); } 333 AUE_NULL MSTD { int linux_sched_getscheduler(l_pid_t pid); } 334 AUE_NULL MNOPROTO { int sched_yield(void); } -335 AUE_NULL MSTD { int linux_sched_get_priority_max( \ +335 AUE_GETPRIORITY MSTD { int linux_sched_get_priority_max( \ l_int policy); } -336 AUE_NULL MSTD { int linux_sched_get_priority_min( \ +336 AUE_GETPRIORITY MSTD { int linux_sched_get_priority_min( \ l_int policy); } 337 AUE_NULL NOPROTO { int sched_rr_get_interval (pid_t pid, \ struct timespec *interval); } @@ -493,66 +494,66 @@ l_ulong old_len, l_ulong new_len, \ l_ulong flags, l_ulong new_addr); } 342 AUE_NULL STD { int linux_nfsservctl(void); } -343 AUE_NULL MNOPROTO { int setresuid(uid_t ruid, \ +343 AUE_SETRESUID MNOPROTO { int setresuid(uid_t ruid, \ uid_t euid, uid_t suid); } -344 AUE_NULL MNOPROTO { int getresuid(uid_t *ruid, \ +344 AUE_GETRESUID MNOPROTO { int getresuid(uid_t *ruid, \ uid_t *euid, uid_t *suid); } 345 AUE_NULL STD { int linux_pciconfig_read(void); } 346 AUE_NULL STD { int linux_pciconfig_write(void); } 347 AUE_NULL STD { int linux_query_module(void); } 348 AUE_NULL STD { int linux_prctl(void); } -349 AUE_NULL STD { int linux_pread(l_uint fd, char *buf, \ +349 AUE_PREAD STD { int linux_pread(l_uint fd, char *buf, \ l_size_t nbyte, l_loff_t offset); } -350 AUE_NULL STD { int linux_pwrite(l_uint fd, char *buf, \ +350 AUE_PWRITE STD { int linux_pwrite(l_uint fd, char *buf, \ l_size_t nbyte, l_loff_t offset); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 11 13:14:55 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2251816A41C; Mon, 11 Jul 2005 13:14:54 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5DA1916A41C for ; Mon, 11 Jul 2005 13:14:54 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1CA4F43D5D for ; Mon, 11 Jul 2005 13:14:54 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6BDErOt050423 for ; Mon, 11 Jul 2005 13:14:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6BDErLm050420 for perforce@freebsd.org; Mon, 11 Jul 2005 13:14:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 11 Jul 2005 13:14:53 GMT Message-Id: <200507111314.j6BDErLm050420@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 79987 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 13:14:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=79987 Change 79987 by rwatson@rwatson_paprika on 2005/07/11 13:14:50 Since auditctl() now accepts a path directly, pass it a path directly. Affected files ... .. //depot/projects/trustedbsd/audit3/usr.sbin/auditon/auditon.c#5 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.sbin/auditon/auditon.c#5 (text+ko) ==== @@ -56,11 +56,11 @@ usage(); if (strcmp(argv[1], "off") == 0) { - if (auditctl(AC_SHUTDOWN, NULL, 0) != 0) + if (auditctl(NULL) != 0) errx(-1, "Shutdown %s", strerror(errno)); } else { path = argv[1]; - if (auditctl(AC_SETLOGFILE, &path, sizeof(path)) != 0) + if (auditctl(path) != 0) errx(-1, "%s: %s", path, strerror(errno)); } exit(0); From owner-p4-projects@FreeBSD.ORG Mon Jul 11 13:16:58 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE31216A420; Mon, 11 Jul 2005 13:16:57 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AF41A16A41C for ; Mon, 11 Jul 2005 13:16:57 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EDDA043D53 for ; Mon, 11 Jul 2005 13:16:56 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6BDGuA8050659 for ; Mon, 11 Jul 2005 13:16:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6BDGu3h050656 for perforce@freebsd.org; Mon, 11 Jul 2005 13:16:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 11 Jul 2005 13:16:56 GMT Message-Id: <200507111316.j6BDGu3h050656@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 79988 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 13:16:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=79988 Change 79988 by rwatson@rwatson_zoo on 2005/07/11 13:16:29 Various NO_SEBSD build fixups. Affected files ... .. //depot/projects/trustedbsd/sebsd/usr.bin/login/login.c#11 edit .. //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/Makefile#5 edit .. //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/database.c#6 edit .. //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/do_command.c#8 edit .. //depot/projects/trustedbsd/sebsd/usr.sbin/pwd_mkdb/pwd_mkdb.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/usr.bin/login/login.c#11 (text+ko) ==== @@ -80,9 +80,9 @@ #include #include -#ifdef SEBSD #include #include +#ifdef SEBSD #include #include #endif ==== //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/Makefile#5 (text+ko) ==== @@ -9,7 +9,7 @@ DPADD= ${LIBCRON} ${LIBUTIL} LDADD= ${LIBCRON} -lutil -.if !defined(SEBSD) +.if !defined(NO_SEBSD) CFLAGS+= -I${.CURDIR}/../../../sys CFLAGS+= -DSEBSD DPADD+= ${LIBSEBSD} ==== //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/database.c#6 (text+ko) ==== @@ -30,9 +30,12 @@ #include #include + +#ifdef SEBSD #include #include #include +#endif #define TMAX(a,b) ((a)>(b)?(a):(b)) ==== //depot/projects/trustedbsd/sebsd/usr.sbin/cron/cron/do_command.c#8 (text+ko) ==== @@ -33,7 +33,9 @@ # include #endif #include +#ifdef SEBSD #include +#endif static void child_process __P((entry *, user *)), @@ -307,10 +309,10 @@ e->envp); #ifdef SEBSD } +#endif /* !SEBSD */ warn("execl: couldn't exec `%s'", shell); _exit(ERROR_EXIT); } -#endif /* !SEBSD */ break; default: /* parent process */ ==== //depot/projects/trustedbsd/sebsd/usr.sbin/pwd_mkdb/pwd_mkdb.c#8 (text+ko) ==== @@ -711,7 +711,11 @@ void +#ifdef SEBSD mv(char *from, char *to, const char *label) +#else +mv(char *from, char *to, __unused const char *label) +#endif { char buf[MAXPATHLEN]; From owner-p4-projects@FreeBSD.ORG Mon Jul 11 13:36:22 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A897116A420; Mon, 11 Jul 2005 13:36:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6570616A41C for ; Mon, 11 Jul 2005 13:36:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3256C43D46 for ; Mon, 11 Jul 2005 13:36:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6BDaLpJ052350 for ; Mon, 11 Jul 2005 13:36:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6BDaKSk052347 for perforce@freebsd.org; Mon, 11 Jul 2005 13:36:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 11 Jul 2005 13:36:20 GMT Message-Id: <200507111336.j6BDaKSk052347@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 79991 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 13:36:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=79991 Change 79991 by rwatson@rwatson_zoo on 2005/07/11 13:35:44 Let namei() do the copyin for the pathname in auditctl(2). Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#25 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#25 (text+ko) ==== @@ -1220,7 +1220,6 @@ int auditctl(struct thread *td, struct auditctl_args *uap) { - char *fn = NULL; struct nameidata nd; struct ucred *cred; struct vnode *vp; @@ -1242,13 +1241,8 @@ if (uap->path == NULL) return (EINVAL); - fn = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); - error = copyinstr(uap->path, fn, MAXPATHLEN, NULL); - if (error != 0) - goto err_out; - mtx_lock(&Giant); - NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_SYSSPACE, fn, td); + NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE, uap->path, td); flags = audit_open_flags; error = vn_open(&nd, &flags, 0, -1); if (error) { @@ -1271,8 +1265,6 @@ audit_rotate_vnode(cred, vp); err_out: - if (fn) - free(fn, M_TEMP); return (error); } From owner-p4-projects@FreeBSD.ORG Mon Jul 11 13:40:28 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63FCA16A423; Mon, 11 Jul 2005 13:40:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0772016A425 for ; Mon, 11 Jul 2005 13:40:27 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B46A943D45 for ; Mon, 11 Jul 2005 13:40:26 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6BDeQnr052640 for ; Mon, 11 Jul 2005 13:40:26 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6BDeQZF052637 for perforce@freebsd.org; Mon, 11 Jul 2005 13:40:26 GMT (envelope-from soc-bushman@freebsd.org) Date: Mon, 11 Jul 2005 13:40:26 GMT Message-Id: <200507111340.j6BDeQZF052637@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 79992 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 13:40:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=79992 Change 79992 by soc-bushman@soc-bushman_stinger on 2005/07/11 13:39:36 getserv*_r interface reverted to use (int) as the return value Affected files ... .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getservent.c#9 edit Differences ... ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getservent.c#9 (text+ko) ==== @@ -64,9 +64,6 @@ { SETSERVENT = 1, ENDSERVENT = 2, - SERVENT_UNPACK_SUCCES = 3, - SERVENT_UNPACK_ERANGE = 4, - SERVENT_UNPACK_ERROR = 5, SERVENT_STORAGE_INITIAL = 1 << 10, /* 1 KByte */ SERVENT_STORAGE_MAX = 1 << 20, /* 1 MByte */ }; @@ -82,7 +79,7 @@ { NULL, 0 } }; -static enum constants servent_unpack(char *, struct servent *, char **, size_t); +static int servent_unpack(char *, struct servent *, char **, size_t, int *); /* files backend declarations */ struct files_state @@ -135,24 +132,25 @@ }; }; -static struct servent *wrap_getservbyname_r(struct key key, struct servent *serv, - char *buffer, size_t bufsize); -static struct servent *wrap_getservbyport_r(struct key key, struct servent *serv, - char *buffer, size_t bufsize); -static struct servent *wrap_getservent_r(struct key key, struct servent *serv, - char *buffer, size_t bufsize); -static struct servent *getserv(struct servent *(*fn)(struct key, struct servent *, char *, - size_t), struct key key); +static int wrap_getservbyname_r(struct key key, struct servent *serv, char *buffer, + size_t bufsize, struct servent **res); +static int wrap_getservbyport_r(struct key key, struct servent *serv, char *buffer, + size_t bufsize, struct servent **res); +static int wrap_getservent_r(struct key key, struct servent *serv, char *buffer, + size_t bufsize, struct servent **res); +static struct servent *getserv(int (*fn)(struct key, struct servent *, char *, + size_t, struct servent **), struct key key); -static enum constants -servent_unpack(char *p, struct servent * serv, char ** aliases, size_t aliases_size) +static int +servent_unpack(char *p, struct servent * serv, char ** aliases, size_t aliases_size, + int * errnop) { char *cp, **q, *endp; long l; if (*p == '#') - return SERVENT_UNPACK_ERROR; + return -1; memset(serv, 0, sizeof(struct servent)); @@ -163,18 +161,18 @@ p = strpbrk(p, " \t"); if (p == NULL) - return SERVENT_UNPACK_ERROR; + return -1; *p++ = '\0'; while (*p == ' ' || *p == '\t') p++; cp = strpbrk(p, ",/"); if (cp == NULL) - return SERVENT_UNPACK_ERROR; + return -1; *cp++ = '\0'; l = strtol(p, &endp, 10); if (endp == p || *endp != '\0' || l < 0 || l > USHRT_MAX) - return SERVENT_UNPACK_ERROR; + return -1; serv->s_port = htons((in_port_t)l); serv->s_proto = cp; @@ -191,7 +189,8 @@ *q++ = cp; } else { *q = NULL; - return SERVENT_UNPACK_ERANGE; + *errnop = ERANGE; + return -1; } cp = strpbrk(cp, " \t"); if (cp != NULL) @@ -199,7 +198,7 @@ } *q = NULL; - return SERVENT_UNPACK_SUCCES; + return 0; } /* files backend implementation */ @@ -250,6 +249,7 @@ struct servent *serv; char *buffer; size_t bufsize; + int *errnop; char **aliases; int aliases_size; @@ -278,18 +278,19 @@ serv = va_arg(ap, struct servent *); buffer = va_arg(ap, char *); bufsize = va_arg(ap, size_t); + errnop = va_arg(ap,int *); - rv = files_getstate(&st); - if (rv != 0) { - errno = rv; + *errnop = files_getstate(&st); + if (*errnop != 0) return (NS_UNAVAIL); - } if (st->fp == NULL) st->compat_mode_active = 0; - if (st->fp == NULL && (st->fp = fopen(_PATH_SERVICES, "r")) == NULL) + if (st->fp == NULL && (st->fp = fopen(_PATH_SERVICES, "r")) == NULL) { + *errnop = errno; return (NS_UNAVAIL); + } if (serv_mdata->how == nss_lt_all) stayopen = 1; @@ -302,6 +303,7 @@ do { if (!st->compat_mode_active) { if ((line = fgetln(st->fp, &linesize)) == NULL) { + *errnop = errno; rv = NS_RETURN; break; } @@ -311,14 +313,14 @@ st->compat_mode_active = 1; } else { if (bufsize <= linesize + _ALIGNBYTES + sizeof(char *)) { - errno = ERANGE; + *errnop = ERANGE; rv = NS_RETURN; break; } aliases = (char **)_ALIGN(&buffer[linesize+1]); aliases_size = (buffer + bufsize - (char *)aliases)/sizeof(char *); if (aliases_size < 1) { - errno = ERANGE; + *errnop = ERANGE; rv = NS_RETURN; break; } @@ -332,15 +334,15 @@ switch (serv_mdata->how) { case nss_lt_name: rv = nsdispatch(retval, compat_dtab, NSDB_SERVICES_COMPAT, "getservbyname_r", - compat_src, name, proto, serv, buffer, bufsize); + compat_src, name, proto, serv, buffer, bufsize, errnop); break; case nss_lt_id: rv = nsdispatch(retval, compat_dtab, NSDB_SERVICES_COMPAT, "getservbyport_r", - compat_src, port, proto, serv, buffer, bufsize); + compat_src, port, proto, serv, buffer, bufsize, errnop); break; case nss_lt_all: rv = nsdispatch(retval, compat_dtab, NSDB_SERVICES_COMPAT, "getservent_r", - compat_src, serv, buffer, bufsize); + compat_src, serv, buffer, bufsize, errnop); break; } @@ -350,18 +352,17 @@ continue; } - switch (servent_unpack(line, serv, aliases, aliases_size)) - { - case SERVENT_UNPACK_ERROR: - rv = NS_NOTFOUND; - continue; - case SERVENT_UNPACK_ERANGE: - errno = ERANGE; - rv = NS_RETURN; - goto fin; - default: - break; - }; + rv = servent_unpack(line, serv, aliases, aliases_size, errnop); + if (rv !=0 ) { + if (*errnop == 0) { + rv = NS_NOTFOUND; + continue; + } + else { + rv = NS_RETURN; + break; + } + } switch (serv_mdata->how) { case nss_lt_name: @@ -389,14 +390,13 @@ } } while (!(rv & NS_TERMINATE)); - -fin: + if (!stayopen && st->fp!=NULL) { fclose(st->fp); st->fp = NULL; } - if ((rv == NS_SUCCESS) && (retval != NULL)) + if ((rv ==NS_SUCCESS) && (retval != NULL)) *(struct servent **)retval=serv; return (rv); @@ -463,6 +463,7 @@ struct servent *serv; char *buffer; size_t bufsize; + int *errnop; char **aliases; int aliases_size; @@ -488,15 +489,18 @@ serv = va_arg(ap, struct servent *); buffer = va_arg(ap, char *); bufsize = va_arg(ap, size_t); + errnop = va_arg(ap, int *); - rv = nis_getstate(&st); - if (rv != 0) { - errno = rv; + *errnop = nis_getstate(&st); + if (*errnop != 0) return (NS_UNAVAIL); - } - if ((st->yp_domain[0] == '\0') && (getdomainname(st->yp_domain, sizeof st->yp_domain))) + if (st->yp_domain[0] == '\0') { + if (getdomainname(st->yp_domain, sizeof st->yp_domain)) { + *errnop=errno; return (NS_UNAVAIL); + } + } do { switch (how) @@ -563,7 +567,7 @@ /* we need a room for additional \n symbol */ if (bufsize <= resultbuflen +1 + _ALIGNBYTES + sizeof(char *)) { - errno = ERANGE; + *errnop = ERANGE; rv = NS_RETURN; break; } @@ -571,7 +575,7 @@ aliases=(char **)_ALIGN(&buffer[resultbuflen+2]); aliases_size = (buffer + bufsize - (char *)aliases)/sizeof(char *); if (aliases_size < 1) { - errno = ERANGE; + *errnop = ERANGE; rv = NS_RETURN; break; } @@ -581,22 +585,15 @@ buffer[resultbuflen] = '\n'; buffer[resultbuflen+1] = '\0'; - switch (servent_unpack(buffer, serv, aliases, aliases_size)) { - case SERVENT_UNPACK_ERANGE: - errno = ERANGE; - rv = NS_RETURN; - break; - case SERVENT_UNPACK_ERROR: - rv = NS_NOTFOUND; - break; - case SERVENT_UNPACK_SUCCES: + if (servent_unpack(buffer, serv, aliases, aliases_size, errnop) != 0) { + if (*errnop == 0) + rv = NS_NOTFOUND; + else + rv = NS_RETURN; + } else rv = NS_SUCCESS; - break; - default: - break; - } + free(resultbuf); - free(resultbuf); } while (!(rv & NS_TERMINATE) && (how == nss_lt_all)); fin: @@ -668,9 +665,9 @@ } /* get**_r functions implementation */ -struct servent * +int getservbyname_r(const char *name, const char *proto, - struct servent *serv, char *buffer, size_t bufsize) + struct servent *serv, char *buffer, size_t bufsize, struct servent **result) { static const struct servent_mdata mdata = { nss_lt_name, 0 }; static const struct servent_mdata compat_mdata = { nss_lt_name, 1 }; @@ -684,22 +681,22 @@ { NULL, NULL, NULL } }; - struct servent *result; - int rv; + int rv, ret_errno; - result = NULL; - rv = nsdispatch(&result, dtab, NSDB_SERVICES, "getservbyname_r", defaultsrc, - name, proto, serv, buffer, bufsize); + ret_errno = 0; + *result = NULL; + rv = nsdispatch(result, dtab, NSDB_SERVICES, "getservbyname_r", defaultsrc, + name, proto, serv, buffer, bufsize, &ret_errno); if (rv == NS_SUCCESS) - return (result); + return (0); else - return (NULL); + return (ret_errno); } -struct servent * +int getservbyport_r(int port, const char *proto, struct servent *serv, char *buffer, - size_t bufsize) + size_t bufsize, struct servent **result) { static const struct servent_mdata mdata = { nss_lt_id, 0 }; static const struct servent_mdata compat_mdata = { nss_lt_id, 1 }; @@ -712,22 +709,22 @@ { NSSRC_COMPAT, files_servent, (void *)&compat_mdata }, { NULL, NULL, NULL } }; - - struct servent *result; - int rv; + int rv, ret_errno; - result = NULL; - rv = nsdispatch(&result, dtab, NSDB_SERVICES, "getservbyport_r", defaultsrc, - port, proto, serv, buffer, bufsize); + ret_errno = 0; + *result = NULL; + rv = nsdispatch(result, dtab, NSDB_SERVICES, "getservbyport_r", defaultsrc, + port, proto, serv, buffer, bufsize, &ret_errno); if (rv == NS_SUCCESS) - return (result); + return (0); else - return (NULL); + return (ret_errno); } -struct servent * -getservent_r(struct servent *serv, char *buffer, size_t bufsize) +int +getservent_r(struct servent *serv, char *buffer, size_t bufsize, + struct servent **result) { static const struct servent_mdata mdata = { nss_lt_all, 0 }; static const struct servent_mdata compat_mdata = { nss_lt_all, 1 }; @@ -740,18 +737,17 @@ { NSSRC_COMPAT, files_servent, (void *)&compat_mdata }, { NULL, NULL, NULL } }; - - struct servent *result; - int rv; + int rv, ret_errno; - result = NULL; - rv = nsdispatch(&result, dtab, NSDB_SERVICES, "getservent_r", defaultsrc, - serv, buffer, bufsize); + ret_errno = 0; + *result = NULL; + rv = nsdispatch(result, dtab, NSDB_SERVICES, "getservent_r", defaultsrc, + serv, buffer, bufsize, &ret_errno); if (rv == NS_SUCCESS) - return (result); + return (0); else - return (NULL); + return (ret_errno); } void @@ -795,26 +791,30 @@ free(p); } -static struct servent * -wrap_getservbyname_r(struct key key, struct servent *serv, char *buffer, size_t bufsize) +static int +wrap_getservbyname_r(struct key key, struct servent *serv, char *buffer, size_t bufsize, + struct servent **res) { - return (getservbyname_r(key.name, key.proto, serv, buffer, bufsize)); + return (getservbyname_r(key.name, key.proto, serv, buffer, bufsize, res)); } -static struct servent * -wrap_getservbyport_r(struct key key, struct servent *serv, char *buffer, size_t bufsize) +static int +wrap_getservbyport_r(struct key key, struct servent *serv, char *buffer, size_t bufsize, + struct servent **res) { - return (getservbyport_r(key.port, key.proto, serv, buffer, bufsize)); + return (getservbyport_r(key.port, key.proto, serv, buffer, bufsize, res)); } -static struct servent * -wrap_getservent_r(struct key key, struct servent *serv, char *buffer, size_t bufsize) +static int +wrap_getservent_r(struct key key, struct servent *serv, char *buffer, size_t bufsize, + struct servent **res) { - return (getservent_r(serv, buffer, bufsize)); + return (getservent_r(serv, buffer, bufsize, res)); } static struct servent * -getserv(struct servent *(*fn)(struct key, struct servent *, char *, size_t), struct key key) +getserv(int (*fn)(struct key, struct servent *, char *, size_t, struct servent **), + struct key key) { int rv; struct servent *res; @@ -833,11 +833,12 @@ st->bufsize = SERVENT_STORAGE_INITIAL; } do { - res = fn(key, &st->serv, st->buffer, st->bufsize); - if (res == NULL && errno == ERANGE) { + rv = fn(key, &st->serv, st->buffer, st->bufsize, &res); + if (res == NULL && rv == ERANGE) { free(st->buffer); if ((st->bufsize << 1) > SERVENT_STORAGE_MAX) { st->buffer = NULL; + errno = ERANGE; return (NULL); } st->bufsize <<= 1; @@ -845,7 +846,7 @@ if (st->buffer == NULL) return (NULL); } - } while (res == NULL && errno == ERANGE); + } while (res == NULL && rv == ERANGE); if (rv != 0) errno = rv; return (res); From owner-p4-projects@FreeBSD.ORG Mon Jul 11 13:46:35 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09C2F16A425; Mon, 11 Jul 2005 13:46:35 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BDA6C16A420 for ; Mon, 11 Jul 2005 13:46:34 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8CA6043D53 for ; Mon, 11 Jul 2005 13:46:34 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6BDkYTr053102 for ; Mon, 11 Jul 2005 13:46:34 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6BDkYEO053099 for perforce@freebsd.org; Mon, 11 Jul 2005 13:46:34 GMT (envelope-from soc-bushman@freebsd.org) Date: Mon, 11 Jul 2005 13:46:34 GMT Message-Id: <200507111346.j6BDkYEO053099@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 79993 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 13:46:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=79993 Change 79993 by soc-bushman@soc-bushman_stinger on 2005/07/11 13:45:46 netdb_private.h reverted to use proper declarations of getserv*_r functions Affected files ... .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/netdb_private.h#5 edit Differences ... ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/netdb_private.h#5 (text+ko) ==== @@ -134,11 +134,11 @@ int getprotobyname_r(const char *, struct protoent *, struct protoent_data *); int getprotobynumber_r(int, struct protoent *, struct protoent_data *); int getprotoent_r(struct protoent *, struct protoent_data *); -struct servent *getservbyname_r(const char *, const char *, struct servent *, - char *, size_t); -struct servent *getservbyport_r(int, const char *, struct servent *, - char *, size_t); -struct servent *getservent_r(struct servent *, char *, size_t); +int getservbyname_r(const char *, const char *, struct servent *, + char *, size_t, struct servent **); +int getservbyport_r(int, const char *, struct servent *, + char *, size_t, struct servent **); +int getservent_r(struct servent *, char *, size_t, struct servent **); void sethostent_r(int, struct hostent_data *); void setnetent_r(int, struct netent_data *); void setprotoent_r(int, struct protoent_data *); From owner-p4-projects@FreeBSD.ORG Mon Jul 11 16:06:28 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBB9A16A420; Mon, 11 Jul 2005 16:06:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8F05816A41C for ; Mon, 11 Jul 2005 16:06:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C82543D46 for ; Mon, 11 Jul 2005 16:06:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6BG6Rsg059301 for ; Mon, 11 Jul 2005 16:06:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6BG6RH6059298 for perforce@freebsd.org; Mon, 11 Jul 2005 16:06:27 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 11 Jul 2005 16:06:27 GMT Message-Id: <200507111606.j6BG6RH6059298@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 80002 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 16:06:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=80002 Change 80002 by rwatson@rwatson_paprika on 2005/07/11 16:05:33 Add audit event IDs for getresuid() and setresuid(). These are available on a range of platforms, so don't annotate as platform- specific. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#13 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#13 (text+ko) ==== @@ -291,6 +291,8 @@ #define AUE_LCHFLAGS 362 /* FreeBSD */ #define AUE_SENDFILE 363 /* FreeBSD */ #define AUE_USELIB 364 /* Linux */ +#define AUE_GETRESUID 365 +#define AUE_SETRESUID 366 /* * XXXRW: Values not yet assigned. From owner-p4-projects@FreeBSD.ORG Mon Jul 11 16:08:31 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CABE116A420; Mon, 11 Jul 2005 16:08:30 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A562616A41C for ; Mon, 11 Jul 2005 16:08:30 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 579B943D49 for ; Mon, 11 Jul 2005 16:08:30 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6BG8UUR059442 for ; Mon, 11 Jul 2005 16:08:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6BG8U79059439 for perforce@freebsd.org; Mon, 11 Jul 2005 16:08:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 11 Jul 2005 16:08:30 GMT Message-Id: <200507111608.j6BG8U79059439@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 80003 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 16:08:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=80003 Change 80003 by rwatson@rwatson_paprika on 2005/07/11 16:08:01 Audit event IDs for getresgid()/setresgid(). Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#14 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#14 (text+ko) ==== @@ -293,6 +293,8 @@ #define AUE_USELIB 364 /* Linux */ #define AUE_GETRESUID 365 #define AUE_SETRESUID 366 +#define AUE_GETRESGID 367 +#define AUE_SETRESGID 368 /* * XXXRW: Values not yet assigned. From owner-p4-projects@FreeBSD.ORG Mon Jul 11 16:14:39 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5DE4416A437; Mon, 11 Jul 2005 16:14:39 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 27C3E16A436 for ; Mon, 11 Jul 2005 16:14:39 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA0F243D48 for ; Mon, 11 Jul 2005 16:14:38 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6BGEc0K059765 for ; Mon, 11 Jul 2005 16:14:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6BGEcYO059756 for perforce@freebsd.org; Mon, 11 Jul 2005 16:14:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 11 Jul 2005 16:14:38 GMT Message-Id: <200507111614.j6BGEcYO059756@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 80005 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 16:14:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=80005 Change 80005 by rwatson@rwatson_paprika on 2005/07/11 16:14:00 Fix definition of AUE_SYSINFO, which was incorrectly 39 instead of 239. Add definitions of AUE_SETREUID and AUE_SETREGID from OpenSolaris. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#15 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#15 (text+ko) ==== @@ -69,7 +69,8 @@ #define AUE_SETSOCKOPT 35 #define AUE_FCHOWN 38 #define AUE_FCHMOD 39 -#define AUE_SYSINFO 39 +#define AUE_SETREUID 40 +#define AUE_SETREGID 41 #define AUE_RENAME 42 #define AUE_SHUTDOWN 46 #define AUE_MKDIR 47 @@ -195,6 +196,7 @@ #define AUE_LXSTAT 236 #define AUE_LCHOWN 237 #define AUE_MEMCNTL 238 +#define AUE_SYSINFO 239 #define AUE_XMKNOD 240 #define AUE_FORK1 241 #define AUE_MODLOAD 243 From owner-p4-projects@FreeBSD.ORG Mon Jul 11 16:17:43 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55AE516A420; Mon, 11 Jul 2005 16:17:43 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3169916A41C for ; Mon, 11 Jul 2005 16:17:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEEA243D48 for ; Mon, 11 Jul 2005 16:17:42 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6BGHg9K059988 for ; Mon, 11 Jul 2005 16:17:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6BGHgTG059985 for perforce@freebsd.org; Mon, 11 Jul 2005 16:17:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 11 Jul 2005 16:17:42 GMT Message-Id: <200507111617.j6BGHgTG059985@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 80006 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 16:17:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=80006 Change 80006 by rwatson@rwatson_paprika on 2005/07/11 16:16:46 Integrate additional audit events from OpenBSM into TrustedBSD audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#4 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#4 (text+ko) ==== @@ -69,7 +69,8 @@ #define AUE_SETSOCKOPT 35 #define AUE_FCHOWN 38 #define AUE_FCHMOD 39 -#define AUE_SYSINFO 39 +#define AUE_SETREUID 40 +#define AUE_SETREGID 41 #define AUE_RENAME 42 #define AUE_SHUTDOWN 46 #define AUE_MKDIR 47 @@ -195,6 +196,7 @@ #define AUE_LXSTAT 236 #define AUE_LCHOWN 237 #define AUE_MEMCNTL 238 +#define AUE_SYSINFO 239 #define AUE_XMKNOD 240 #define AUE_FORK1 241 #define AUE_MODLOAD 243 @@ -288,7 +290,13 @@ #define AUE_SYSCTL_NONADMIN 360 #define AUE_COPYFILE 361 #define AUE_LUTIMES 362 -#define AUE_LCHFLAGS 358 +#define AUE_LCHFLAGS 362 /* FreeBSD */ +#define AUE_SENDFILE 363 /* FreeBSD */ +#define AUE_USELIB 364 /* Linux */ +#define AUE_GETRESUID 365 +#define AUE_SETRESUID 366 +#define AUE_GETRESGID 367 +#define AUE_SETRESGID 368 /* * XXXRW: Values not yet assigned. From owner-p4-projects@FreeBSD.ORG Mon Jul 11 16:18:45 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3390116A420; Mon, 11 Jul 2005 16:18:45 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0E00716A41C for ; Mon, 11 Jul 2005 16:18:45 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A2C6543D48 for ; Mon, 11 Jul 2005 16:18:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6BGIiLW060074 for ; Mon, 11 Jul 2005 16:18:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6BGIiH0060071 for perforce@freebsd.org; Mon, 11 Jul 2005 16:18:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 11 Jul 2005 16:18:44 GMT Message-Id: <200507111618.j6BGIiH0060071@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 80007 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 16:18:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=80007 Change 80007 by rwatson@rwatson_paprika on 2005/07/11 16:17:51 Integrate additional audit events from OpenBSM contrib drop to BSM kernel drop. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#5 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_kevents.h#5 (text+ko) ==== @@ -69,7 +69,8 @@ #define AUE_SETSOCKOPT 35 #define AUE_FCHOWN 38 #define AUE_FCHMOD 39 -#define AUE_SYSINFO 39 +#define AUE_SETREUID 40 +#define AUE_SETREGID 41 #define AUE_RENAME 42 #define AUE_SHUTDOWN 46 #define AUE_MKDIR 47 @@ -195,6 +196,7 @@ #define AUE_LXSTAT 236 #define AUE_LCHOWN 237 #define AUE_MEMCNTL 238 +#define AUE_SYSINFO 239 #define AUE_XMKNOD 240 #define AUE_FORK1 241 #define AUE_MODLOAD 243 @@ -288,7 +290,13 @@ #define AUE_SYSCTL_NONADMIN 360 #define AUE_COPYFILE 361 #define AUE_LUTIMES 362 -#define AUE_LCHFLAGS 358 +#define AUE_LCHFLAGS 362 /* FreeBSD */ +#define AUE_SENDFILE 363 /* FreeBSD */ +#define AUE_USELIB 364 /* Linux */ +#define AUE_GETRESUID 365 +#define AUE_SETRESUID 366 +#define AUE_GETRESGID 367 +#define AUE_SETRESGID 368 /* * XXXRW: Values not yet assigned. From owner-p4-projects@FreeBSD.ORG Mon Jul 11 16:27:58 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB03B16A420; Mon, 11 Jul 2005 16:27:57 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B4A0816A41C for ; Mon, 11 Jul 2005 16:27:57 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 63CD943D45 for ; Mon, 11 Jul 2005 16:27:57 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6BGRvMG060419 for ; Mon, 11 Jul 2005 16:27:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6BGRuG0060416 for perforce@freebsd.org; Mon, 11 Jul 2005 16:27:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 11 Jul 2005 16:27:57 GMT Message-Id: <200507111627.j6BGRuG0060416@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 80010 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 16:27:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=80010 Change 80010 by rwatson@rwatson_zoo on 2005/07/11 16:27:09 Fix AUE_FSTATFS spelling. Don't audit Linux-emulated readdir(), mremap() for now, since we don't have a record type for them yet. Don't audit Linux-emulated getreuid(), getregid(), getresuid(), getresgid(), as they're not required. Fix spelling of AUE_SETREUID/GID from GETREUID/GID. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysent.c#9 edit .. //depot/projects/trustedbsd/audit3/sys/i386/linux/syscalls.master#8 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysent.c#9 (text+ko) ==== @@ -109,7 +109,7 @@ { AS(linux_uselib_args), (sy_call_t *)linux_uselib, AUE_NULL }, /* 86 = linux_uselib */ { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 87 = swapon */ { AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT }, /* 88 = linux_reboot */ - { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_READDIR }, /* 89 = linux_readdir */ + { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_NULL }, /* 89 = linux_readdir */ { AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP }, /* 90 = linux_mmap */ { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP }, /* 91 = munmap */ { AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 92 = linux_truncate */ @@ -120,7 +120,7 @@ { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 97 = setpriority */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 98 = profil */ { AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS }, /* 99 = linux_statfs */ - { AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_NFSTATFS }, /* 100 = linux_fstatfs */ + { AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS }, /* 100 = linux_fstatfs */ { AS(linux_ioperm_args), (sy_call_t *)linux_ioperm, AUE_NULL }, /* 101 = linux_ioperm */ { AS(linux_socketcall_args), (sy_call_t *)linux_socketcall, AUE_NULL }, /* 102 = linux_socketcall */ { AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL }, /* 103 = linux_syslog */ @@ -183,15 +183,15 @@ { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_NULL }, /* 160 = linux_sched_get_priority_min */ { SYF_MPSAFE | AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_NULL }, /* 161 = sched_rr_get_interval */ { SYF_MPSAFE | AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL }, /* 162 = nanosleep */ - { AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_MREMAP }, /* 163 = linux_mremap */ + { AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL }, /* 163 = linux_mremap */ { SYF_MPSAFE | AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID }, /* 164 = linux_setresuid16 */ - { SYF_MPSAFE | AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID }, /* 165 = linux_getresuid16 */ + { SYF_MPSAFE | AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_NULL }, /* 165 = linux_getresuid16 */ { 0, (sy_call_t *)linux_vm86, AUE_NULL }, /* 166 = linux_vm86 */ { 0, (sy_call_t *)linux_query_module, AUE_NULL }, /* 167 = linux_query_module */ { AS(poll_args), (sy_call_t *)poll, AUE_POLL }, /* 168 = poll */ { 0, (sy_call_t *)linux_nfsservctl, AUE_NULL }, /* 169 = linux_nfsservctl */ { SYF_MPSAFE | AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID }, /* 170 = linux_setresgid16 */ - { SYF_MPSAFE | AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID }, /* 171 = linux_getresgid16 */ + { SYF_MPSAFE | AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_NULL }, /* 171 = linux_getresgid16 */ { 0, (sy_call_t *)linux_prctl, AUE_NULL }, /* 172 = linux_prctl */ { AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_SIGRETURN }, /* 173 = linux_rt_sigreturn */ { SYF_MPSAFE | AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_SIGACTION }, /* 174 = linux_rt_sigaction */ @@ -223,15 +223,15 @@ { SYF_MPSAFE | 0, (sy_call_t *)linux_getgid, AUE_GETGID }, /* 200 = linux_getgid */ { SYF_MPSAFE | 0, (sy_call_t *)geteuid, AUE_GETEUID }, /* 201 = geteuid */ { SYF_MPSAFE | 0, (sy_call_t *)getegid, AUE_GETEGID }, /* 202 = getegid */ - { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_GETREUID }, /* 203 = setreuid */ - { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_GETREGID }, /* 204 = setregid */ + { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 203 = setreuid */ + { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 204 = setregid */ { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS }, /* 205 = linux_getgroups */ { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS }, /* 206 = linux_setgroups */ { AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 207 = fchown */ { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID }, /* 208 = setresuid */ - { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID }, /* 209 = getresuid */ + { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_NULL }, /* 209 = getresuid */ { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID }, /* 210 = setresgid */ - { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID }, /* 211 = getresgid */ + { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_NULL }, /* 211 = getresgid */ { AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN }, /* 212 = linux_chown */ { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 213 = setuid */ { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 214 = setgid */ @@ -240,7 +240,7 @@ { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_NULL }, /* 217 = linux_pivot_root */ { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE }, /* 218 = linux_mincore */ { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 219 = madvise */ - { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDSNTS }, /* 220 = linux_getdents64 */ + { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS }, /* 220 = linux_getdents64 */ { SYF_MPSAFE | AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL }, /* 221 = linux_fcntl64 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 222 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 223 = */ ==== //depot/projects/trustedbsd/audit3/sys/i386/linux/syscalls.master#8 (text+ko) ==== @@ -173,7 +173,7 @@ 87 AUE_SWAPON NOPROTO { int swapon(char *name); } 88 AUE_REBOOT STD { int linux_reboot(l_int magic1, \ l_int magic2, l_uint cmd, void *arg); } -89 AUE_READDIR STD { int linux_readdir(l_uint fd, \ +89 AUE_NULL STD { int linux_readdir(l_uint fd, \ struct l_dirent *dent, l_uint count); } 90 AUE_MMAP STD { int linux_mmap(struct l_mmap_argv *ptr); } 91 AUE_MUNMAP NOPROTO { int munmap(caddr_t addr, int len); } @@ -188,7 +188,7 @@ 98 AUE_NULL UNIMPL profil 99 AUE_STATFS STD { int linux_statfs(char *path, \ struct l_statfs_buf *buf); } -100 AUE_NFSTATFS STD { int linux_fstatfs(l_uint fd, \ +100 AUE_FSTATFS STD { int linux_fstatfs(l_uint fd, \ struct l_statfs_buf *buf); } 101 AUE_NULL STD { int linux_ioperm(l_ulong start, \ l_ulong length, l_int enable); } @@ -291,12 +291,12 @@ 162 AUE_NULL MNOPROTO { int nanosleep( \ const struct timespec *rqtp, \ struct timespec *rmtp); } -163 AUE_MREMAP STD { int linux_mremap(l_ulong addr, \ +163 AUE_NULL STD { int linux_mremap(l_ulong addr, \ l_ulong old_len, l_ulong new_len, \ l_ulong flags, l_ulong new_addr); } 164 AUE_SETRESUID MSTD { int linux_setresuid16(l_uid16_t ruid, \ l_uid16_t euid, l_uid16_t suid); } -165 AUE_GETRESUID MSTD { int linux_getresuid16(l_uid16_t *ruid, \ +165 AUE_NULL MSTD { int linux_getresuid16(l_uid16_t *ruid, \ l_uid16_t *euid, l_uid16_t *suid); } 166 AUE_NULL STD { int linux_vm86(void); } 167 AUE_NULL STD { int linux_query_module(void); } @@ -305,7 +305,7 @@ 169 AUE_NULL STD { int linux_nfsservctl(void); } 170 AUE_SETRESGID MSTD { int linux_setresgid16(l_gid16_t rgid, \ l_gid16_t egid, l_gid16_t sgid); } -171 AUE_GETRESGID MSTD { int linux_getresgid16(l_gid16_t *rgid, \ +171 AUE_NULL MSTD { int linux_getresgid16(l_gid16_t *rgid, \ l_gid16_t *egid, l_gid16_t *sgid); } 172 AUE_NULL STD { int linux_prctl(void); } 173 AUE_SIGRETURN STD { int linux_rt_sigreturn( \ @@ -359,8 +359,8 @@ 200 AUE_GETGID MSTD { int linux_getgid(void); } 201 AUE_GETEUID MNOPROTO { int geteuid(void); } 202 AUE_GETEGID MNOPROTO { int getegid(void); } -203 AUE_GETREUID MNOPROTO { int setreuid(uid_t ruid, uid_t euid); } -204 AUE_GETREGID MNOPROTO { int setregid(gid_t rgid, gid_t egid); } +203 AUE_SETREUID MNOPROTO { int setreuid(uid_t ruid, uid_t euid); } +204 AUE_SETREGID MNOPROTO { int setregid(gid_t rgid, gid_t egid); } 205 AUE_GETGROUPS MSTD { int linux_getgroups(l_int gidsetsize, \ l_gid_t *grouplist); } 206 AUE_SETGROUPS MSTD { int linux_setgroups(l_int gidsetsize, \ @@ -368,11 +368,11 @@ 207 AUE_FCHOWN NODEF fchown fchown fchown_args int 208 AUE_SETRESUID MNOPROTO { int setresuid(uid_t ruid, uid_t euid, \ uid_t suid); } -209 AUE_GETRESUID MNOPROTO { int getresuid(uid_t *ruid, uid_t *euid, \ +209 AUE_NULL MNOPROTO { int getresuid(uid_t *ruid, uid_t *euid, \ uid_t *suid); } 210 AUE_SETRESGID MNOPROTO { int setresgid(gid_t rgid, gid_t egid, \ gid_t sgid); } -211 AUE_GETRESGID MNOPROTO { int getresgid(gid_t *rgid, gid_t *egid, \ +211 AUE_NULL MNOPROTO { int getresgid(gid_t *rgid, gid_t *egid, \ gid_t *sgid); } 212 AUE_CHOWN STD { int linux_chown(char *path, l_uid_t uid, \ l_gid_t gid); } @@ -386,7 +386,7 @@ l_size_t len, u_char *vec); } 219 AUE_MADVISE MNOPROTO { int madvise(void *addr, size_t len, \ int behav); } -220 AUE_O_GETDSNTS STD { int linux_getdents64(l_uint fd, \ +220 AUE_O_GETDENTS STD { int linux_getdents64(l_uint fd, \ void *dirent, l_uint count); } 221 AUE_FCNTL MSTD { int linux_fcntl64(l_uint fd, l_uint cmd, \ l_ulong arg); } From owner-p4-projects@FreeBSD.ORG Mon Jul 11 16:30:01 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFE1116A420; Mon, 11 Jul 2005 16:30:00 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA18616A41C for ; Mon, 11 Jul 2005 16:30:00 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5860143D49 for ; Mon, 11 Jul 2005 16:30:00 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6BGU0xQ060575 for ; Mon, 11 Jul 2005 16:30:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6BGU0Vk060572 for perforce@freebsd.org; Mon, 11 Jul 2005 16:30:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 11 Jul 2005 16:30:00 GMT Message-Id: <200507111630.j6BGU0Vk060572@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 80011 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 16:30:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=80011 Change 80011 by rwatson@rwatson_zoo on 2005/07/11 16:29:21 Do audit setresuid()/setresgid() using the new BSM event identifiers. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#15 edit .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#17 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#15 (text+ko) ==== @@ -340,8 +340,8 @@ { SYF_MPSAFE | AS(kldstat_args), (sy_call_t *)kldstat, AUE_NULL }, /* 308 = kldstat */ { SYF_MPSAFE | AS(kldfirstmod_args), (sy_call_t *)kldfirstmod, AUE_NULL }, /* 309 = kldfirstmod */ { SYF_MPSAFE | AS(getsid_args), (sy_call_t *)getsid, AUE_GETSID }, /* 310 = getsid */ - { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_NULL }, /* 311 = setresuid */ - { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_NULL }, /* 312 = setresgid */ + { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID }, /* 311 = setresuid */ + { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID }, /* 312 = setresgid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 313 = obsolete signanosleep */ { AS(aio_return_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 314 = aio_return */ { AS(aio_suspend_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 315 = aio_suspend */ ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#17 (text+ko) ==== @@ -531,9 +531,9 @@ kld_file_stat* stat); } 309 AUE_NULL MSTD { int kldfirstmod(int fileid); } 310 AUE_GETSID MSTD { int getsid(pid_t pid); } -311 AUE_NULL MSTD { int setresuid(uid_t ruid, uid_t euid, \ +311 AUE_SETRESUID MSTD { int setresuid(uid_t ruid, uid_t euid, \ uid_t suid); } -312 AUE_NULL MSTD { int setresgid(gid_t rgid, gid_t egid, \ +312 AUE_SETRESGID MSTD { int setresgid(gid_t rgid, gid_t egid, \ gid_t sgid); } 313 AUE_NULL OBSOL signanosleep 314 AUE_NULL NOSTD { int aio_return(struct aiocb *aiocbp); } From owner-p4-projects@FreeBSD.ORG Mon Jul 11 17:20:04 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C048516A420; Mon, 11 Jul 2005 17:20:03 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 929D616A41C for ; Mon, 11 Jul 2005 17:20:03 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F083143D46 for ; Mon, 11 Jul 2005 17:20:02 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6BHK2kO070104 for ; Mon, 11 Jul 2005 17:20:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6BHK1Sh070101 for perforce@freebsd.org; Mon, 11 Jul 2005 17:20:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 11 Jul 2005 17:20:01 GMT Message-Id: <200507111720.j6BHK1Sh070101@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 80014 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 17:20:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=80014 Change 80014 by rwatson@rwatson_paprika on 2005/07/11 17:19:39 Audit sendfile() using new AUE_SENDFILE event. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#18 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#18 (text+ko) ==== @@ -571,7 +571,7 @@ 334 AUE_NULL MSTD { int sched_rr_get_interval (pid_t pid, \ struct timespec *interval); } 335 AUE_NULL MSTD { int utrace(const void *addr, size_t len); } -336 AUE_NULL MCOMPAT4 { int sendfile(int fd, int s, \ +336 AUE_SENDFILE MCOMPAT4 { int sendfile(int fd, int s, \ off_t offset, size_t nbytes, \ struct sf_hdtr *hdtr, off_t *sbytes, \ int flags); } @@ -678,7 +678,7 @@ 391 AUE_LCHFLAGS MSTD { int lchflags(const char *path, int flags); } 392 AUE_NULL MSTD { int uuidgen(struct uuid *store, \ int count); } -393 AUE_NULL MSTD { int sendfile(int fd, int s, off_t offset, \ +393 AUE_SENDFILE MSTD { int sendfile(int fd, int s, off_t offset, \ size_t nbytes, struct sf_hdtr *hdtr, \ off_t *sbytes, int flags); } 394 AUE_NULL MSTD { int mac_syscall(const char *policy, \ From owner-p4-projects@FreeBSD.ORG Mon Jul 11 18:18:16 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB2AE16A420; Mon, 11 Jul 2005 18:18:15 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 84B5B16A41C for ; Mon, 11 Jul 2005 18:18:15 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5005C43D48 for ; Mon, 11 Jul 2005 18:18:15 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6BIIFcw072781 for ; Mon, 11 Jul 2005 18:18:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6BIIFx0072778 for perforce@freebsd.org; Mon, 11 Jul 2005 18:18:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 11 Jul 2005 18:18:15 GMT Message-Id: <200507111818.j6BIIFx0072778@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 80021 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 18:18:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=80021 Change 80021 by rwatson@rwatson_paprika on 2005/07/11 18:17:59 Define audit event identifiers for a number of non-Solaris events. sendfile() is cross-platform, so don't mark as FreeBSD-centric. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#16 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#16 (text+ko) ==== @@ -291,12 +291,18 @@ #define AUE_COPYFILE 361 #define AUE_LUTIMES 362 #define AUE_LCHFLAGS 362 /* FreeBSD */ -#define AUE_SENDFILE 363 /* FreeBSD */ +#define AUE_SENDFILE 363 #define AUE_USELIB 364 /* Linux */ #define AUE_GETRESUID 365 #define AUE_SETRESUID 366 #define AUE_GETRESGID 367 #define AUE_SETRESGID 368 +#define AUE_WAIT4 369 /* FreeBSD */ +#define AUE_LGETFH 370 /* FreeBSD */ +#define AUE_FHSTATFS 371 /* FreeBSD */ +#define AUE_FHOPEN 372 /* FreeBSD */ +#define AUE_FHSTAT 373 /* FreeBSD */ +#define AUE_JAIL 374 /* FreeBSD */ /* * XXXRW: Values not yet assigned. From owner-p4-projects@FreeBSD.ORG Mon Jul 11 20:54:25 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3A2E16A420; Mon, 11 Jul 2005 20:54:24 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9346116A41C for ; Mon, 11 Jul 2005 20:54:24 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 43B2843D48 for ; Mon, 11 Jul 2005 20:54:24 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6BKsOwS086163 for ; Mon, 11 Jul 2005 20:54:24 GMT (envelope-from soc-victor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6BKsOWq086160 for perforce@freebsd.org; Mon, 11 Jul 2005 20:54:24 GMT (envelope-from soc-victor@freebsd.org) Date: Mon, 11 Jul 2005 20:54:24 GMT Message-Id: <200507112054.j6BKsOWq086160@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-victor@freebsd.org using -f From: soc-victor To: Perforce Change Reviews Cc: Subject: PERFORCE change 80025 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 20:54:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=80025 Change 80025 by soc-victor@soc-victor_82.76.158.176 on 2005/07/11 20:53:56 Added partial SNMP SET support for hrSystemDate SNMP scalar. (Timezone change still not implemented). Also fixed a bunch of coding style issues as Harti advised me. More coding style cleanup in the next submits. Affected files ... .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#4 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#3 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#3 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#3 edit Differences ... ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#4 (text+ko) ==== @@ -8,6 +8,7 @@ MOD= hostres SRCS= hostres_snmp.c hostres_scalars.c WARNS?= 6 +#Not having NDEBUG defined will enable assertions and a lot of output on stderr CFLAGS+= -DNDEBUG XSYM= host hrStorageOther hrStorageRam hrStorageVirtualMemory \ hrStorageFixedDisk hrStorageRemovableDisk hrStorageFloppyDisk \ ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#3 (text+ko) ==== @@ -112,31 +112,33 @@ */ static uint32_t OS_getMemorySize(void); + +/* + * Try to use the s_date_time parameter as a DateAndTime TC to fill in + * the second paramter. + * Returns 0 on succes an < 0 for an error. + * Bug: time zone info is not used + */ +static +int OS_checkSystemDateInput(u_char s_date_time[11], struct timeval* out); /* + * Set system date and time. Timezone is not changed + * Return 0 for success, < 0 for an error + */ +static +int OS_setSystemDate(struct timeval* timeval_to_set); +/* * prototype of this function was genrated by gensnmptree tool in header file * hostres_tree.h * Returns SNMP_ERR_NOERROR on success */ -int op_hrSystem(struct snmp_context *ctx __unused, +int op_hrSystem(struct snmp_context *ctx, struct snmp_value *value, u_int sub, u_int iidx __unused, enum snmp_op curr_op) { - switch (curr_op) { - case SNMP_OP_SET: - case SNMP_OP_GET: - break; - - case SNMP_OP_ROLLBACK: - case SNMP_OP_COMMIT: - case SNMP_OP_GETNEXT: - default:{ - assert(0); - return (SNMP_ERR_GENERR); - } - }/*end switch*/ if(curr_op == SNMP_OP_GET){ switch (value->var.subs[sub - 1]) { @@ -144,7 +146,7 @@ value->v.uint32 = OS_getSystemUptime(); break; - case LEAF_hrSystemDate:{ + case LEAF_hrSystemDate: { u_char s_date_time[11]; int s_date_time_len = -1; if((s_date_time_len = OS_getSystemDate(s_date_time)) < 0){ @@ -157,17 +159,17 @@ value->v.uint32 = 0; /*FIX ME*/ break; - case LEAF_hrSystemInitialLoadParameters:{ + case LEAF_hrSystemInitialLoadParameters: { u_char *sys_load_param = NULL; - if((sys_load_param = OS_getSystemInitialLoadParameters()) != NULL){ + if((sys_load_param = OS_getSystemInitialLoadParameters()) != NULL) { return (string_get(value, sys_load_param, -1)); }else{ return (SNMP_ERR_GENERR); } } - case LEAF_hrSystemNumUsers:{ + case LEAF_hrSystemNumUsers: { int num_users = OS_getSystemNumUsers(); - if( num_users >= 0 ){ + if( num_users >= 0 ) { value->v.uint32 = num_users; }else{ return (SNMP_ERR_GENERR); @@ -175,9 +177,9 @@ } break; - case LEAF_hrSystemProcesses:{ + case LEAF_hrSystemProcesses: { int num_proc = OS_getSystemProcesses(); - if( num_proc >= 0 ){ + if( num_proc >= 0 ) { value->v.uint32 = num_proc; }else{ return (SNMP_ERR_GENERR); @@ -185,7 +187,7 @@ } break; - case LEAF_hrSystemMaxProcesses:{ + case LEAF_hrSystemMaxProcesses: { int max_proc = OS_getSystemMaxProcesses(); if( max_proc >= 0 ){ value->v.uint32 = max_proc; @@ -201,13 +203,31 @@ } }/*end switch*/ - }else{ - /*SNMP SET*/ - switch (value->var.subs[sub - 1]){ - case LEAF_hrSystemDate: + } else if(curr_op == SNMP_OP_SET ) { + + switch (value->var.subs[sub - 1]) { + case LEAF_hrSystemDate: { + if ( string_save(value, ctx, 8, + &hostres_ctx_g.time_to_set ) == SNMP_ERR_NOERROR + || + string_save(value, ctx, 11, + &hostres_ctx_g.time_to_set ) == SNMP_ERR_NOERROR + ) { + + if( OS_checkSystemDateInput( hostres_ctx_g.time_to_set, + &hostres_ctx_g.timeval_to_set) != 0 ) { + HR_DPRINTF((stderr, + "Parse for '%s' failed as DateAndTime \n", + hostres_ctx_g.time_to_set)); + return (SNMP_ERR_GENERR); + } + } + return (SNMP_ERR_NOERROR); + + } case LEAF_hrSystemInitialLoadDevice: case LEAF_hrSystemInitialLoadParameters: - default:{ + default: { /*not implmeted yet*/ assert(0); return (SNMP_ERR_GENERR); @@ -215,7 +235,55 @@ } } - } + } else if (curr_op == SNMP_OP_ROLLBACK ) { + switch (value->var.subs[sub - 1]) { + case LEAF_hrSystemDate: { + HR_DPRINTF((stderr, "SNMP_OP_ROLLBACK for LEAF_hrSystemDate\n")); + string_rollback(ctx, &hostres_ctx_g.time_to_set); + hostres_ctx_g.timeval_to_set.tv_sec = 0; + hostres_ctx_g.timeval_to_set.tv_usec = 0; + return (SNMP_ERR_NOERROR); + } + + case LEAF_hrSystemInitialLoadDevice: + case LEAF_hrSystemInitialLoadParameters: + default: { + /*not implmeted yet*/ + assert(0); + return (SNMP_ERR_GENERR); + + } + } + + } else if (curr_op == SNMP_OP_COMMIT ) { + switch (value->var.subs[sub - 1]) { + case LEAF_hrSystemDate: { + HR_DPRINTF((stderr, + "SNMP_OP_COMMIT for LEAF_hrSystemDate\n")); + string_commit(ctx); + if( OS_setSystemDate(&hostres_ctx_g.timeval_to_set) != 0 ) { + HR_DPRINTF((stderr, + "SNMP_OP_COMMIT FAILEDfor LEAF_hrSystemDate\n")); + return (SNMP_ERR_GENERR); + } + return (SNMP_ERR_NOERROR); + } + + case LEAF_hrSystemInitialLoadDevice: + case LEAF_hrSystemInitialLoadParameters: + default: { + /*not implmeted yet*/ + assert(0); + return (SNMP_ERR_GENERR); + + } + } + + } else{ + /*get next*/ + HR_DPRINTF((stderr, "SNMP_OP_GETNEXT meaningless for scalars \n")); + return (SNMP_ERR_GENERR); + } return (SNMP_ERR_NOERROR); } @@ -273,12 +341,12 @@ * FreeBSD specific functions zone */ -uint32_t OS_getSystemUptime(void){ +uint32_t OS_getSystemUptime(void) { struct timeval right_now = {0,0}; - if( hostres_ctx_g.kernel_boot == 0 ){ + if( hostres_ctx_g.kernel_boot == 0 ) { /*first time, do the sysctl*/ @@ -286,12 +354,12 @@ int mib[2]={CTL_KERN,KERN_BOOTTIME}; size_t len = sizeof(kernel_boot_timestamp); - if(sysctl(mib, 2, &kernel_boot_timestamp, &len, NULL, 0) == -1){ - syslog(LOG_ERR,"sysctl KERN_BOOTTIME failed: %m "); - return 0; /*error*/ + if(sysctl(mib, 2, &kernel_boot_timestamp, &len, NULL, 0) == -1) { + syslog(LOG_ERR, "sysctl KERN_BOOTTIME failed: %m "); + return (0); /*error*/ } - HR_DPRINTF((stderr,"Got boot timestamp from kernel:{%ld,%ld}\n", + HR_DPRINTF((stderr, "Got boot timestamp from kernel:{%ld,%ld}\n", kernel_boot_timestamp.tv_sec, kernel_boot_timestamp.tv_usec)); @@ -299,9 +367,9 @@ (kernel_boot_timestamp.tv_usec / 10000); } - if( gettimeofday(&right_now, NULL) < 0 ){ - syslog(LOG_ERR,"gettimeofday failed: %m "); - return 0; /*error*/ + if( gettimeofday(&right_now, NULL) < 0 ) { + syslog(LOG_ERR, "gettimeofday failed: %m "); + return (0); /*error*/ } return ( (right_now.tv_sec * 100) + @@ -314,21 +382,21 @@ -int OS_getSystemDate(u_char s_date_time[11]){ +int OS_getSystemDate(u_char s_date_time[11]) { struct tm tloc_tm; time_t tloc_time_t; struct timeval right_now = {0,0}; int string_len = -1; - if( gettimeofday(&right_now, NULL) < 0 ){ - syslog(LOG_ERR,"gettimeofday failed: %m "); + if( gettimeofday(&right_now, NULL) < 0 ) { + syslog(LOG_ERR, "gettimeofday failed: %m "); return (-1); /*error*/ } tloc_time_t = right_now.tv_sec; - if(localtime_r(&tloc_time_t, &tloc_tm) == NULL ){ - syslog(LOG_ERR,"localtime_r() failed: %m "); + if(localtime_r(&tloc_time_t, &tloc_tm) == NULL ) { + syslog(LOG_ERR, "localtime_r() failed: %m "); return (-1); /*error*/ } @@ -359,28 +427,28 @@ OS_getSystemInitialLoadParameters(void){ - if( strlen(hostres_ctx_g.k_boot_line) == 0){ - int mib[2]={CTL_KERN,KERN_BOOTFILE}; + if( strlen(hostres_ctx_g.k_boot_line) == 0) { + int mib[2]={ CTL_KERN, KERN_BOOTFILE }; char *buf = NULL; size_t buf_len = 0; - sysctl(mib, 2, NULL, &buf_len, NULL, 0);/*got the needed buffer len */ + sysctl(mib, 2, NULL, &buf_len, NULL, 0); /*got the needed buffer len */ buf = (u_char*)malloc(buf_len); if(buf == NULL){ - syslog(LOG_ERR,"malloc failed "); + syslog(LOG_ERR, "malloc failed "); return (NULL); /*error*/ } if ( sysctl(mib, 2, buf, &buf_len, NULL, 0) ) { - syslog(LOG_ERR,"sysctl({CTL_KERN,KERN_BOOTFILE}) failed: %m "); + syslog(LOG_ERR, "sysctl({CTL_KERN,KERN_BOOTFILE}) failed: %m "); free(buf); return (NULL); /*error*/ } (void)strncpy(hostres_ctx_g.k_boot_line, buf, 127); - HR_DPRINTF((stderr,"Got kernel boot file: %s\n",hostres_ctx_g.k_boot_line)); + HR_DPRINTF((stderr, "Got kernel boot file: %s\n", hostres_ctx_g.k_boot_line)); free(buf); } return ((u_char*)&hostres_ctx_g.k_boot_line[0]); @@ -388,73 +456,116 @@ -int OS_getSystemNumUsers(void){ +int OS_getSystemNumUsers(void) { int user_counter = 0; struct utmp utmp_entry; struct passwd *pw; - if( hostres_ctx_g.utmp_fp == (FILE*)NULL ){ + if( hostres_ctx_g.utmp_fp == (FILE*)NULL ) { assert(0); - return -1; /*error*/ + return (-1); /*error*/ } /*start with the begining of the utmp file*/ rewind(hostres_ctx_g.utmp_fp); - while (fread(&utmp_entry, sizeof(utmp_entry), 1, hostres_ctx_g.utmp_fp) == 1){ - if (utmp_entry.ut_name[0] && utmp_entry.ut_line[0]){ - if( (pw = getpwnam(utmp_entry.ut_name)) == NULL){ + while (fread(&utmp_entry, sizeof(utmp_entry), 1, hostres_ctx_g.utmp_fp) == 1 ) { + if (utmp_entry.ut_name[0] && utmp_entry.ut_line[0]) { + if( (pw = getpwnam(utmp_entry.ut_name)) == NULL ) { continue; } user_counter++; } } - return user_counter; + return (user_counter); } -int OS_getSystemProcesses(void){ +int OS_getSystemProcesses(void) { int proc_count = 0; - if( hostres_ctx_g.kd == (kvm_t*)NULL ){ + if( hostres_ctx_g.kd == (kvm_t*)NULL ) { assert(0); - return -1; /*error*/ + return (-1); /*error*/ } - if( kvm_getprocs(hostres_ctx_g.kd, KERN_PROC_PROC, 0, &proc_count) == NULL ){ - syslog(LOG_ERR,"kvm_getprocs failed: %m "); - return -1;/*error*/ + if( kvm_getprocs(hostres_ctx_g.kd, KERN_PROC_PROC, 0, &proc_count) == NULL ) { + syslog(LOG_ERR, "kvm_getprocs failed: %m "); + return (-1);/*error*/ } - return proc_count; + return (proc_count); } -int OS_getSystemMaxProcesses(void){ - if( hostres_ctx_g.max_proc == 0 ){ +int OS_getSystemMaxProcesses(void) { + if( hostres_ctx_g.max_proc == 0 ) { int mib[2] = {CTL_KERN, KERN_MAXPROC}; size_t len = 0; len = sizeof(hostres_ctx_g.max_proc); - if(sysctl(mib, 2, &hostres_ctx_g.max_proc, &len, NULL, 0) == -1){ - syslog(LOG_ERR,"sysctl KERN_MAXPROC failed: %m "); - return -1; /*error*/ + if(sysctl(mib, 2, &hostres_ctx_g.max_proc, &len, NULL, 0) == -1) { + syslog(LOG_ERR, "sysctl KERN_MAXPROC failed: %m "); + return (-1); /*error*/ } HR_DPRINTF((stderr, "Got kernel maxporc: %d\n",hostres_ctx_g.max_proc)); } - return hostres_ctx_g.max_proc; + return (hostres_ctx_g.max_proc); } -uint32_t OS_getMemorySize(void){ +uint32_t OS_getMemorySize(void) { - if(hostres_ctx_g.phys_mem_size == 0){ + if(hostres_ctx_g.phys_mem_size == 0) { int mib[2] = { CTL_HW, HW_PHYSMEM }; size_t len = sizeof(hostres_ctx_g.phys_mem_size); - if (sysctl(mib, 2, &hostres_ctx_g.phys_mem_size, &len, NULL, 0) == -1){ - syslog(LOG_ERR,"sysctl({ CTL_HW, HW_PHYSMEM }) failed: %m "); - return 0;/*error*/ + if (sysctl(mib, 2, &hostres_ctx_g.phys_mem_size, &len, NULL, 0) == -1) { + syslog(LOG_ERR, "sysctl({ CTL_HW, HW_PHYSMEM }) failed: %m "); + return 0; /*error*/ } - hostres_ctx_g.phys_mem_size = hostres_ctx_g.phys_mem_size/1024; + hostres_ctx_g.phys_mem_size = hostres_ctx_g.phys_mem_size / 1024; + } + return (hostres_ctx_g.phys_mem_size); + +} + + +int OS_checkSystemDateInput(u_char s_date_time[11], struct timeval* out) { + struct tm tm_to_set; + time_t time_t_to_set; + + + if( out == NULL ) { + assert(0); + return (-1); /*error*/ + } + + tm_to_set.tm_year = (( (int32_t)s_date_time[0] )<<8) + + ((int32_t)s_date_time[1]-1900); + tm_to_set.tm_mon = (int32_t)s_date_time[2]-1; + tm_to_set.tm_mday = (int32_t)s_date_time[3]; + tm_to_set.tm_hour = (int32_t)s_date_time[4]; + tm_to_set.tm_min = (int32_t)s_date_time[5]; + tm_to_set.tm_sec = (int32_t)s_date_time[6]; + + /*the input is interpreted as local time, not UTC, not GMT*/ + + if( (time_t_to_set = mktime(&tm_to_set) ) == (time_t)-1) { + return (-1); /*error*/ } - return hostres_ctx_g.phys_mem_size; + out->tv_sec = time_t_to_set; /*seconds*/ + out->tv_usec = (int32_t)s_date_time[7] * 100000; /*deci-seconds to micro-seconds*/ + + return ( 0 ); + +} +int OS_setSystemDate(struct timeval* timeval_to_set) { + if(timeval_to_set != NULL) { + if( settimeofday( timeval_to_set, (struct timezone *)NULL) < 0 ) { + HR_DPRINTF(( stderr, "settimeofday done\n" )); + syslog(LOG_ERR, "settimeofday failed: %m "); + return (-1); /*error*/ + } + return (0); + } + return (-1); /*error*/ } ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#3 (text+ko) ==== @@ -56,7 +56,7 @@ Returns 0 on success, < 0 on error */ static -int hostres_init(struct lmodule * mod, int argc __unused, char *argv[] __unused){ +int hostres_init(struct lmodule * mod, int argc __unused, char *argv[] __unused) { hostres_module = mod; @@ -72,20 +72,20 @@ hostres_ctx_g.phys_mem_size = 0; - if( ( hostres_ctx_g.utmp_fp = fopen(_PATH_UTMP, "r") ) == (FILE*)NULL){ - syslog(LOG_ERR,"fopen(%s) failed: %m ",(const char*)_PATH_UTMP); + if( ( hostres_ctx_g.utmp_fp = fopen(_PATH_UTMP, "r") ) == (FILE*)NULL) { + syslog(LOG_ERR, "fopen(%s) failed: %m ", (const char*)_PATH_UTMP); return (-1); /*error*/ } if( ( hostres_ctx_g.kd = kvm_open(NULL, _PATH_DEVNULL, NULL, O_RDONLY, "kvm_open")) == (kvm_t*)NULL ) { - syslog(LOG_ERR,"kvm_open failed: %m "); + syslog(LOG_ERR, "kvm_open failed: %m "); return (-1); /*error*/ } - HR_DPRINTF((stderr,"[%s] done.\n", __FUNCTION__)); + HR_DPRINTF((stderr, "[%s] done.\n", __func__)); return (0); } @@ -98,17 +98,17 @@ int hostres_fini(void) { /* here I free the resources used by this module*/ - if( hostres_ctx_g.utmp_fp != (FILE*)NULL ){ - if( fclose(hostres_ctx_g.utmp_fp) != 0 ){ - syslog(LOG_ERR,"fclose failed: %m "); + if( hostres_ctx_g.utmp_fp != (FILE*)NULL ) { + if( fclose(hostres_ctx_g.utmp_fp) != 0 ) { + syslog(LOG_ERR, "fclose failed: %m "); return (-1); /*error*/ } hostres_ctx_g.utmp_fp = (FILE*)NULL; } - if( hostres_ctx_g.kd != (kvm_t*)NULL ){ - if( kvm_close(hostres_ctx_g.kd) != 0 ){ - syslog(LOG_ERR,"kvm_close failed: %m "); + if( hostres_ctx_g.kd != (kvm_t*)NULL ) { + if( kvm_close(hostres_ctx_g.kd) != 0 ) { + syslog(LOG_ERR, "kvm_close failed: %m "); return (-1); /*error*/ } hostres_ctx_g.kd = (kvm_t*)NULL; @@ -127,7 +127,7 @@ if( host_registration_id > 0){ or_unregister(host_registration_id); } - HR_DPRINTF((stderr,"[%s] done.\n", __FUNCTION__)); + HR_DPRINTF((stderr, "[%s] done.\n", __func__)); return (0); } @@ -136,9 +136,9 @@ returns nothing */ static -void hostres_idle_v(void){ +void hostres_idle_v(void) { /*nothing iteresting here for the time being*/ - HR_DPRINTF((stderr,"[%s] done.\n ", __FUNCTION__)); + HR_DPRINTF((stderr, "[%s] done.\n ", __func__)); } /* @@ -146,9 +146,9 @@ returns nothing */ static -void hostres_dump_v(void){ +void hostres_dump_v(void) { /*nothing iteresting here for the time being*/ - HR_DPRINTF((stderr, "[%s] done.\n ", __FUNCTION__)); + HR_DPRINTF((stderr, "[%s] done.\n ", __func__)); } @@ -157,9 +157,9 @@ returns nothing */ static -void hostres_config_v(void){ +void hostres_config_v(void) { /*nothing iteresting here for the time being*/ - HR_DPRINTF((stderr, "[%s] done.\n ", __FUNCTION__)); + HR_DPRINTF((stderr, "[%s] done.\n ", __func__)); } @@ -168,11 +168,11 @@ void hostres_loading_v(const struct lmodule *mod __unused, int loaded) { /*nothing iteresting here for the time being*/ - if (loaded == 1){ + if ( loaded == 1 ) { goto LABEL_RETURN; } LABEL_RETURN:; - HR_DPRINTF((stderr,"[%s] done.\n ", __FUNCTION__)); + HR_DPRINTF((stderr,"[%s] done.\n ", __func__)); } /* @@ -180,11 +180,11 @@ returns nothing */ static -void hostres_start_v(void){ - host_registration_id = or_register(&oid_host, - "The MIB module for host resource mib (rfc 2790).", +void hostres_start_v(void) { + host_registration_id = or_register(&oid_host, + "The MIB module for host resource mib (rfc 2790).", hostres_module); - HR_DPRINTF((stderr, "[%s] done.\n ", __FUNCTION__)); + HR_DPRINTF((stderr, "[%s] done.\n ", __func__)); } /*this identifies the HOST RESOURCES mib module*/ ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#3 (text+ko) ==== @@ -34,20 +34,20 @@ #include "asn1.h" #include "snmp.h" #include "snmpmod.h" -#include /*for FILE */ -#include /*for kvm_open & friends*/ +#include /*for FILE */ +#include /*for kvm_open & friends*/ #include +#include /*for struct timeval*/ /*a debug macro*/ #ifndef NDEBUG - -#define HR_DPRINTF(args) (fprintf(stderr,"HR DEBUG: "), fprintf args) - +#define HR_DPRINTF(ARGS) do { \ + fprintf(stderr, "HRDEBUG: "); \ + fprintf ARGS; \ + } while (0) #else - #define HR_DPRINTF(args) - #endif /*NDEBUG*/ typedef struct hostres_ctx_struct{ @@ -58,6 +58,10 @@ int max_proc; /*maximum number of processes */ uint32_t phys_mem_size; /*physical memory size in Kb*/ + u_char *time_to_set; /*for setting hrSystemDate*/ + struct timeval timeval_to_set; /*for setting hrSystemDate*/ + + }hostres_ctx_type; extern hostres_ctx_type hostres_ctx_g; From owner-p4-projects@FreeBSD.ORG Mon Jul 11 21:13:50 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4601816A420; Mon, 11 Jul 2005 21:13:50 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C30C316A41C for ; Mon, 11 Jul 2005 21:13:49 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5483F43D49 for ; Mon, 11 Jul 2005 21:13:49 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6BLDnwV086873 for ; Mon, 11 Jul 2005 21:13:49 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6BLDmv0086870 for perforce@freebsd.org; Mon, 11 Jul 2005 21:13:48 GMT (envelope-from peter@freebsd.org) Date: Mon, 11 Jul 2005 21:13:48 GMT Message-Id: <200507112113.j6BLDmv0086870@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 80026 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 21:13:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=80026 Change 80026 by peter@peter_daintree on 2005/07/11 21:13:20 IFC @80022 Affected files ... .. //depot/projects/hammer/Makefile.inc1#96 integrate .. //depot/projects/hammer/UPDATING#81 integrate .. //depot/projects/hammer/bin/sh/expand.c#10 integrate .. //depot/projects/hammer/contrib/binutils/opcodes/sparc-opc.c#4 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/freebsd.h#4 integrate .. //depot/projects/hammer/contrib/libpcap/CHANGES#4 integrate .. //depot/projects/hammer/contrib/libpcap/CREDITS#4 integrate .. //depot/projects/hammer/contrib/libpcap/FILES#4 integrate .. //depot/projects/hammer/contrib/libpcap/INSTALL.txt#4 integrate .. //depot/projects/hammer/contrib/libpcap/README.septel#1 branch .. //depot/projects/hammer/contrib/libpcap/VERSION#5 integrate .. //depot/projects/hammer/contrib/libpcap/config.h.in#4 integrate .. //depot/projects/hammer/contrib/libpcap/configure#4 integrate .. //depot/projects/hammer/contrib/libpcap/configure.in#4 integrate .. //depot/projects/hammer/contrib/libpcap/fad-getad.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/fad-gifc.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/fad-glifc.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/gencode.c#6 integrate .. //depot/projects/hammer/contrib/libpcap/gencode.h#4 integrate .. //depot/projects/hammer/contrib/libpcap/grammar.y#4 integrate .. //depot/projects/hammer/contrib/libpcap/inet.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/nametoaddr.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-bpf.c#7 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-bpf.h#3 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-dag.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-dlpi.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-dos.c#2 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-int.h#5 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-linux.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-namedb.h#3 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-nit.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-pf.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-septel.c#1 branch .. //depot/projects/hammer/contrib/libpcap/pcap-septel.h#1 branch .. //depot/projects/hammer/contrib/libpcap/pcap-snit.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-snoop.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/pcap-win32.c#3 integrate .. //depot/projects/hammer/contrib/libpcap/pcap.3#6 integrate .. //depot/projects/hammer/contrib/libpcap/pcap.c#5 integrate .. //depot/projects/hammer/contrib/libpcap/pcap.h#5 integrate .. //depot/projects/hammer/contrib/libpcap/rawss7.h#2 delete .. //depot/projects/hammer/contrib/libpcap/savefile.c#4 integrate .. //depot/projects/hammer/contrib/libpcap/scanner.l#5 integrate .. //depot/projects/hammer/contrib/tcpdump/CHANGES#5 integrate .. //depot/projects/hammer/contrib/tcpdump/CREDITS#5 integrate .. //depot/projects/hammer/contrib/tcpdump/FILES#5 integrate .. //depot/projects/hammer/contrib/tcpdump/INSTALL#5 integrate .. //depot/projects/hammer/contrib/tcpdump/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/tcpdump/VERSION#5 integrate .. //depot/projects/hammer/contrib/tcpdump/acconfig.h#4 integrate .. //depot/projects/hammer/contrib/tcpdump/addrtoname.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/atm.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/config.h.in#5 integrate .. //depot/projects/hammer/contrib/tcpdump/configure#5 integrate .. //depot/projects/hammer/contrib/tcpdump/configure.in#5 integrate .. //depot/projects/hammer/contrib/tcpdump/gmpls.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/gmpls.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/interface.h#5 integrate .. //depot/projects/hammer/contrib/tcpdump/ip6.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/ipproto.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/ipproto.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/llc.h#4 integrate .. //depot/projects/hammer/contrib/tcpdump/oui.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/oui.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/pcap-missing.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/pcap_dump_ftell.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/pmap_prot.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-802_11.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-atm.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-bfd.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-bgp.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/print-bootp.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-chdlc.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-cnfp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-decnet.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-domain.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-eigrp.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-esp.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ether.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-fr.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-frag6.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-hsrp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-icmp.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-icmp6.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-igrp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ip.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ip6.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ip6opts.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ipx.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-isoclns.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/print-juniper.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-l2tp.c#6 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ldp.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-llc.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-lmp.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-lspping.c#2 integrate .. //depot/projects/hammer/contrib/tcpdump/print-mobility.c#3 integrate .. //depot/projects/hammer/contrib/tcpdump/print-mpls.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-nfs.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ntp.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-null.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ospf.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-pgm.c#1 branch .. //depot/projects/hammer/contrib/tcpdump/print-pim.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-ppp.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-pppoe.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-rsvp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-rt6.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-sctp.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-sll.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-smb.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-snmp.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-stp.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-sunrpc.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/print-tcp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-vrrp.c#4 integrate .. //depot/projects/hammer/contrib/tcpdump/print-zephyr.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/rpc_auth.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/rpc_msg.h#2 integrate .. //depot/projects/hammer/contrib/tcpdump/smbutil.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/tcpdump-stdinc.h#3 integrate .. //depot/projects/hammer/contrib/tcpdump/tcpdump.1#5 integrate .. //depot/projects/hammer/contrib/tcpdump/tcpdump.c#5 integrate .. //depot/projects/hammer/contrib/tcpdump/util.c#5 integrate .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_supplicant.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/appl/su/Makefile.am#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/su/su.c#5 integrate .. //depot/projects/hammer/etc/rc.d/ipfilter#20 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/tmac/mdoc.local#22 integrate .. //depot/projects/hammer/kerberos5/usr.bin/ksu/Makefile#8 integrate .. //depot/projects/hammer/lib/libc/stdlib/grantpt.c#3 integrate .. //depot/projects/hammer/lib/libc/sys/Makefile.inc#16 integrate .. //depot/projects/hammer/lib/libc/sys/read.2#11 integrate .. //depot/projects/hammer/lib/libc/sys/write.2#9 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_krb5/Makefile#6 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_krb5/pam_krb5.c#8 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_unix/pam_unix.c#9 integrate .. //depot/projects/hammer/lib/libpmc/pmclog.c#3 integrate .. //depot/projects/hammer/lib/libz/inftrees.c#4 integrate .. //depot/projects/hammer/release/Makefile#74 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#102 integrate .. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#15 integrate .. //depot/projects/hammer/sbin/devd/devd.cc#12 integrate .. //depot/projects/hammer/sbin/devd/devd.h#5 integrate .. //depot/projects/hammer/sbin/devd/devd.hh#3 integrate .. //depot/projects/hammer/sbin/devd/parse.y#5 integrate .. //depot/projects/hammer/sbin/devd/token.l#5 integrate .. //depot/projects/hammer/sbin/ggate/Makefile#2 integrate .. //depot/projects/hammer/sbin/ggate/ggatec/Makefile#4 integrate .. //depot/projects/hammer/sbin/ggate/ggatec/ggatec.c#3 integrate .. //depot/projects/hammer/sbin/ggate/ggated/Makefile#3 integrate .. //depot/projects/hammer/sbin/ggate/ggated/ggated.c#4 integrate .. //depot/projects/hammer/sbin/ggate/ggatel/ggatel.c#4 integrate .. //depot/projects/hammer/sbin/ggate/shared/ggate.c#4 integrate .. //depot/projects/hammer/sbin/ggate/shared/ggate.h#3 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#25 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#12 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#39 integrate .. //depot/projects/hammer/share/man/man4/altq.4#9 integrate .. //depot/projects/hammer/share/man/man4/ed.4#9 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/ep.4#12 integrate .. //depot/projects/hammer/share/man/man4/ng_pppoe.4#9 integrate .. //depot/projects/hammer/share/man/man4/sn.4#4 integrate .. //depot/projects/hammer/share/man/man4/wi.4#21 integrate .. //depot/projects/hammer/share/man/man4/xe.4#7 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#37 integrate .. //depot/projects/hammer/sys/alpha/alpha/vm_machdep.c#23 integrate .. //depot/projects/hammer/sys/alpha/include/atomic.h#8 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_misc.c#17 integrate .. //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#24 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#75 integrate .. //depot/projects/hammer/sys/amd64/include/atomic.h#15 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#44 integrate .. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#16 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#30 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#29 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#27 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#27 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#27 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#31 integrate .. //depot/projects/hammer/sys/compat/linux/linux_getcwd.c#11 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#30 integrate .. //depot/projects/hammer/sys/compat/linux/linux_socket.c#19 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#32 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_ipc.c#6 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#20 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_socket.c#7 integrate .. //depot/projects/hammer/sys/conf/files#116 integrate .. //depot/projects/hammer/sys/conf/newvers.sh#16 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#33 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#17 integrate .. //depot/projects/hammer/sys/dev/auxio/auxio.c#4 integrate .. //depot/projects/hammer/sys/dev/cp/if_cp.c#18 integrate .. //depot/projects/hammer/sys/dev/ctau/if_ct.c#19 integrate .. //depot/projects/hammer/sys/dev/cx/if_cx.c#25 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#24 integrate .. //depot/projects/hammer/sys/dev/em/README#9 integrate .. //depot/projects/hammer/sys/dev/fb/creator.c#8 integrate .. //depot/projects/hammer/sys/dev/fb/machfb.c#3 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme_pci.c#14 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_amd.c#6 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_logging.c#3 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#5 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_piv.c#5 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_ppro.c#5 integrate .. //depot/projects/hammer/sys/dev/ipw/if_ipw.c#6 integrate .. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#6 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/fc_log.h#3 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi.h#4 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_cnfg.h#4 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_fc.h#3 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_init.h#4 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_ioc.h#4 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_lan.h#3 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_raid.h#4 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_targ.h#3 integrate .. //depot/projects/hammer/sys/dev/mpt/mpilib/mpi_type.h#5 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt.c#8 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt.h#4 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_cam.c#1 branch .. //depot/projects/hammer/sys/dev/mpt/mpt_cam.h#1 branch .. //depot/projects/hammer/sys/dev/mpt/mpt_debug.c#7 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_freebsd.c#13 delete .. //depot/projects/hammer/sys/dev/mpt/mpt_freebsd.h#7 delete .. //depot/projects/hammer/sys/dev/mpt/mpt_pci.c#12 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_raid.c#1 branch .. //depot/projects/hammer/sys/dev/mpt/mpt_raid.h#1 branch .. //depot/projects/hammer/sys/dev/mpt/mpt_reg.h#1 branch .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#35 integrate .. //depot/projects/hammer/sys/dev/ral/if_ral.c#5 integrate .. //depot/projects/hammer/sys/dev/sn/if_sn.c#19 integrate .. //depot/projects/hammer/sys/dev/sn/if_sn_isa.c#6 integrate .. //depot/projects/hammer/sys/dev/sn/if_sn_pccard.c#10 integrate .. //depot/projects/hammer/sys/dev/sn/if_snvar.h#5 integrate .. //depot/projects/hammer/sys/dev/usb/if_ural.c#5 integrate .. //depot/projects/hammer/sys/dev/usb/if_uralvar.h#3 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#61 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi_pccard.c#27 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe_pccard.c#16 integrate .. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vncache.c#13 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#29 integrate .. //depot/projects/hammer/sys/geom/gate/g_gate.c#12 integrate .. //depot/projects/hammer/sys/geom/gate/g_gate.h#3 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/exception.s#10 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#46 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_isc.c#3 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_misc.c#14 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_sysi86.c#5 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_xenix.c#6 integrate .. //depot/projects/hammer/sys/i386/include/atomic.h#8 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#27 integrate .. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#29 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#45 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#28 integrate .. //depot/projects/hammer/sys/kern/sys_generic.c#25 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#44 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#44 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#50 integrate .. //depot/projects/hammer/sys/modules/Makefile#82 integrate .. //depot/projects/hammer/sys/modules/mpt/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/syscons/Makefile#3 integrate .. //depot/projects/hammer/sys/net/bpf.h#13 integrate .. //depot/projects/hammer/sys/net/bridgestp.c#2 integrate .. //depot/projects/hammer/sys/net/bsd_comp.c#6 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#5 integrate .. //depot/projects/hammer/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/hammer/sys/net/if_ppp.c#20 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto.c#8 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_ccmp.c#5 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.h#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#20 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#20 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.h#9 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#22 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.h#15 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#16 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#16 integrate .. //depot/projects/hammer/sys/netatalk/ddp_output.c#10 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#47 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#54 integrate .. //depot/projects/hammer/sys/pc98/cbus/clock.c#3 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#33 integrate .. //depot/projects/hammer/sys/pci/if_ti.c#31 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/busdma_machdep.c#16 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/vm_machdep.c#25 integrate .. //depot/projects/hammer/sys/security/mac/mac_net.c#12 integrate .. //depot/projects/hammer/sys/security/mac/mac_socket.c#4 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#34 integrate .. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#23 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#33 integrate .. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#16 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#34 integrate .. //depot/projects/hammer/sys/sparc64/creator/creator.h#5 integrate .. //depot/projects/hammer/sys/sparc64/creator/creator_upa.c#9 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/vm_machdep.c#23 integrate .. //depot/projects/hammer/sys/sys/mac.h#26 integrate .. //depot/projects/hammer/sys/sys/mac_policy.h#28 integrate .. //depot/projects/hammer/sys/sys/param.h#63 integrate .. //depot/projects/hammer/sys/sys/pmc.h#6 integrate .. //depot/projects/hammer/sys/sys/proc.h#83 integrate .. //depot/projects/hammer/sys/sys/socketvar.h#29 integrate .. //depot/projects/hammer/sys/sys/syscall.h#43 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#43 integrate .. //depot/projects/hammer/sys/sys/syscallsubr.h#22 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#43 integrate .. //depot/projects/hammer/sys/sys/uio.h#12 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#37 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8#6 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/main.c#11 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.c#5 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.h#2 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat_log.c#2 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/tcpip.c#6 integrate .. //depot/projects/hammer/usr.sbin/tcpdump/tcpdump/Makefile#10 integrate .. //depot/projects/hammer/usr.sbin/tcpdump/tcpdump/config.h#5 integrate .. //depot/projects/hammer/usr.sbin/wpa/hostapd/driver_freebsd.c#2 integrate .. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#2 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#96 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.498 2005/06/16 18:16:12 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.499 2005/07/07 00:58:41 kan Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -472,7 +472,7 @@ @echo Entering world for ${TARGET_ARCH}:${TARGET} @cd ${.CURDIR} && env ${WMAKEENV} sh || true -TOOLCHAIN_TGTS= ${WMAKE_TGTS:N_depend:Neverything} +TOOLCHAIN_TGTS= ${WMAKE_TGTS:N_depend:Neverything:Nbuild32} toolchain: ${TOOLCHAIN_TGTS} kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_libraries} ==== //depot/projects/hammer/UPDATING#81 (text+ko) ==== @@ -8,8 +8,8 @@ /usr/ports/UPDATING. Please read that file before running portupgrade. -NOTE TO PEOPLE WHO THINK THAT FreeBSD 6.x IS SLOW: - FreeBSD 6.x has many debugging features turned on, in +NOTE TO PEOPLE WHO THINK THAT FreeBSD 7.x IS SLOW: + FreeBSD 7.x has many debugging features turned on, in both the kernel and userland. These features attempt to detect incorrect use of system primitives, and encourage loud failure through extra sanity checking and fail stop semantics. They @@ -21,6 +21,9 @@ developers choose to disable these features on build machines to maximize performance. +20050711: + RELENG_6 branched here. + 20050629: The pccard_ifconfig rc.conf variable has been removed and a new variable, ifconfig_DEFAULT has been introduced. Unlike @@ -397,4 +400,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.416 2005/07/01 15:12:09 des Exp $ +$FreeBSD: src/UPDATING,v 1.417 2005/07/11 15:46:45 kensmith Exp $ ==== //depot/projects/hammer/bin/sh/expand.c#10 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.46 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.47 2005/07/07 18:10:33 delphij Exp $"); #include #include @@ -1162,7 +1162,7 @@ if (*p == '\0') break; } - if (metaflag == 0 || stat(expdir, &statb) >= 0) + if (metaflag == 0 || lstat(expdir, &statb) >= 0) addfname(expdir); return; } ==== //depot/projects/hammer/contrib/binutils/opcodes/sparc-opc.c#4 (text+ko) ==== @@ -1273,110 +1273,72 @@ #define FM_DF 2 /* v9 */ #define FM_QF 3 /* v9 */ -#define fmovicc(opcode, fpsize, cond, flags) /* v9 */ \ -{ opcode, F3F(2, 0x35, 0x100+fpsize)|MCOND(cond,0), F3F(~2, ~0x35, ~(0x100+fpsize))|MCOND(~cond,~0), "z,f,g", flags, v9 }, \ -{ opcode, F3F(2, 0x35, 0x180+fpsize)|MCOND(cond,0), F3F(~2, ~0x35, ~(0x180+fpsize))|MCOND(~cond,~0), "Z,f,g", flags, v9 } +#define fmoviccx(opcode, fpsize, args, cond, flags) /* v9 */ \ +{ opcode, F3F(2, 0x35, 0x100+fpsize)|MCOND(cond,0), F3F(~2, ~0x35, ~(0x100+fpsize))|MCOND(~cond,~0), "z," args, flags, v9 }, \ +{ opcode, F3F(2, 0x35, 0x180+fpsize)|MCOND(cond,0), F3F(~2, ~0x35, ~(0x180+fpsize))|MCOND(~cond,~0), "Z," args, flags, v9 } -#define fmovfcc(opcode, fpsize, fcond, flags) /* v9 */ \ -{ opcode, F3F(2, 0x35, 0x000+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x000+fpsize))|MCOND(~fcond,~0), "6,f,g", flags, v9 }, \ -{ opcode, F3F(2, 0x35, 0x040+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x040+fpsize))|MCOND(~fcond,~0), "7,f,g", flags, v9 }, \ -{ opcode, F3F(2, 0x35, 0x080+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x080+fpsize))|MCOND(~fcond,~0), "8,f,g", flags, v9 }, \ -{ opcode, F3F(2, 0x35, 0x0c0+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x0c0+fpsize))|MCOND(~fcond,~0), "9,f,g", flags, v9 } +#define fmovfccx(opcode, fpsize, args, fcond, flags) /* v9 */ \ +{ opcode, F3F(2, 0x35, 0x000+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x000+fpsize))|MCOND(~fcond,~0), "6," args, flags, v9 }, \ +{ opcode, F3F(2, 0x35, 0x040+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x040+fpsize))|MCOND(~fcond,~0), "7," args, flags, v9 }, \ +{ opcode, F3F(2, 0x35, 0x080+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x080+fpsize))|MCOND(~fcond,~0), "8," args, flags, v9 }, \ +{ opcode, F3F(2, 0x35, 0x0c0+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x0c0+fpsize))|MCOND(~fcond,~0), "9," args, flags, v9 } /* FIXME: use fmovicc/fmovfcc? */ /* v9 */ -#define fmovcc(opcode, fpsize, cond, fcond, flags) /* v9 */ \ -{ opcode, F3F(2, 0x35, 0x100+fpsize)|MCOND(cond,0), F3F(~2, ~0x35, ~(0x100+fpsize))|MCOND(~cond,~0), "z,f,g", flags | F_FLOAT, v9 }, \ -{ opcode, F3F(2, 0x35, 0x000+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x000+fpsize))|MCOND(~fcond,~0), "6,f,g", flags | F_FLOAT, v9 }, \ -{ opcode, F3F(2, 0x35, 0x180+fpsize)|MCOND(cond,0), F3F(~2, ~0x35, ~(0x180+fpsize))|MCOND(~cond,~0), "Z,f,g", flags | F_FLOAT, v9 }, \ -{ opcode, F3F(2, 0x35, 0x040+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x040+fpsize))|MCOND(~fcond,~0), "7,f,g", flags | F_FLOAT, v9 }, \ -{ opcode, F3F(2, 0x35, 0x080+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x080+fpsize))|MCOND(~fcond,~0), "8,f,g", flags | F_FLOAT, v9 }, \ -{ opcode, F3F(2, 0x35, 0x0c0+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x0c0+fpsize))|MCOND(~fcond,~0), "9,f,g", flags | F_FLOAT, v9 } +#define fmovccx(opcode, fpsize, args, cond, fcond, flags) /* v9 */ \ +{ opcode, F3F(2, 0x35, 0x100+fpsize)|MCOND(cond,0), F3F(~2, ~0x35, ~(0x100+fpsize))|MCOND(~cond,~0), "z," args, flags | F_FLOAT, v9 }, \ +{ opcode, F3F(2, 0x35, 0x000+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x000+fpsize))|MCOND(~fcond,~0), "6," args, flags | F_FLOAT, v9 }, \ +{ opcode, F3F(2, 0x35, 0x180+fpsize)|MCOND(cond,0), F3F(~2, ~0x35, ~(0x180+fpsize))|MCOND(~cond,~0), "Z," args, flags | F_FLOAT, v9 }, \ +{ opcode, F3F(2, 0x35, 0x040+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x040+fpsize))|MCOND(~fcond,~0), "7," args, flags | F_FLOAT, v9 }, \ +{ opcode, F3F(2, 0x35, 0x080+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x080+fpsize))|MCOND(~fcond,~0), "8," args, flags | F_FLOAT, v9 }, \ +{ opcode, F3F(2, 0x35, 0x0c0+fpsize)|MCOND(fcond,0), F3F(~2, ~0x35, ~(0x0c0+fpsize))|MCOND(~fcond,~0), "9," args, flags | F_FLOAT, v9 } + +#define fmovicc(suffix, cond, flags) /* v9 */ \ +fmoviccx("fmovd" suffix, FM_DF, "B,H", cond, flags), \ +fmoviccx("fmovq" suffix, FM_QF, "R,J", cond, flags), \ +fmoviccx("fmovs" suffix, FM_SF, "f,g", cond, flags) + +#define fmovfcc(suffix, fcond, flags) /* v9 */ \ +fmovfccx("fmovd" suffix, FM_DF, "B,H", fcond, flags), \ +fmovfccx("fmovq" suffix, FM_QF, "R,J", fcond, flags), \ +fmovfccx("fmovs" suffix, FM_SF, "f,g", fcond, flags) + +#define fmovcc(suffix, cond, fcond, flags) /* v9 */ \ +fmovccx("fmovd" suffix, FM_DF, "B,H", cond, fcond, flags), \ +fmovccx("fmovq" suffix, FM_QF, "R,J", cond, fcond, flags), \ +fmovccx("fmovs" suffix, FM_SF, "f,g", cond, fcond, flags) -/* v9 */ fmovcc ("fmovda", FM_DF, CONDA, FCONDA, 0), -/* v9 */ fmovcc ("fmovqa", FM_QF, CONDA, FCONDA, 0), -/* v9 */ fmovcc ("fmovsa", FM_SF, CONDA, FCONDA, 0), -/* v9 */ fmovicc ("fmovdcc", FM_DF, CONDCC, 0), -/* v9 */ fmovicc ("fmovqcc", FM_QF, CONDCC, 0), -/* v9 */ fmovicc ("fmovscc", FM_SF, CONDCC, 0), -/* v9 */ fmovicc ("fmovdcs", FM_DF, CONDCS, 0), -/* v9 */ fmovicc ("fmovqcs", FM_QF, CONDCS, 0), -/* v9 */ fmovicc ("fmovscs", FM_SF, CONDCS, 0), -/* v9 */ fmovcc ("fmovde", FM_DF, CONDE, FCONDE, 0), -/* v9 */ fmovcc ("fmovqe", FM_QF, CONDE, FCONDE, 0), -/* v9 */ fmovcc ("fmovse", FM_SF, CONDE, FCONDE, 0), -/* v9 */ fmovcc ("fmovdg", FM_DF, CONDG, FCONDG, 0), -/* v9 */ fmovcc ("fmovqg", FM_QF, CONDG, FCONDG, 0), -/* v9 */ fmovcc ("fmovsg", FM_SF, CONDG, FCONDG, 0), -/* v9 */ fmovcc ("fmovdge", FM_DF, CONDGE, FCONDGE, 0), -/* v9 */ fmovcc ("fmovqge", FM_QF, CONDGE, FCONDGE, 0), -/* v9 */ fmovcc ("fmovsge", FM_SF, CONDGE, FCONDGE, 0), -/* v9 */ fmovicc ("fmovdgeu", FM_DF, CONDGEU, F_ALIAS), -/* v9 */ fmovicc ("fmovqgeu", FM_QF, CONDGEU, F_ALIAS), -/* v9 */ fmovicc ("fmovsgeu", FM_SF, CONDGEU, F_ALIAS), -/* v9 */ fmovicc ("fmovdgu", FM_DF, CONDGU, 0), -/* v9 */ fmovicc ("fmovqgu", FM_QF, CONDGU, 0), -/* v9 */ fmovicc ("fmovsgu", FM_SF, CONDGU, 0), -/* v9 */ fmovcc ("fmovdl", FM_DF, CONDL, FCONDL, 0), -/* v9 */ fmovcc ("fmovql", FM_QF, CONDL, FCONDL, 0), -/* v9 */ fmovcc ("fmovsl", FM_SF, CONDL, FCONDL, 0), -/* v9 */ fmovcc ("fmovdle", FM_DF, CONDLE, FCONDLE, 0), -/* v9 */ fmovcc ("fmovqle", FM_QF, CONDLE, FCONDLE, 0), -/* v9 */ fmovcc ("fmovsle", FM_SF, CONDLE, FCONDLE, 0), -/* v9 */ fmovicc ("fmovdleu", FM_DF, CONDLEU, 0), -/* v9 */ fmovicc ("fmovqleu", FM_QF, CONDLEU, 0), -/* v9 */ fmovicc ("fmovsleu", FM_SF, CONDLEU, 0), -/* v9 */ fmovfcc ("fmovdlg", FM_DF, FCONDLG, 0), -/* v9 */ fmovfcc ("fmovqlg", FM_QF, FCONDLG, 0), -/* v9 */ fmovfcc ("fmovslg", FM_SF, FCONDLG, 0), -/* v9 */ fmovicc ("fmovdlu", FM_DF, CONDLU, F_ALIAS), -/* v9 */ fmovicc ("fmovqlu", FM_QF, CONDLU, F_ALIAS), -/* v9 */ fmovicc ("fmovslu", FM_SF, CONDLU, F_ALIAS), -/* v9 */ fmovcc ("fmovdn", FM_DF, CONDN, FCONDN, 0), -/* v9 */ fmovcc ("fmovqn", FM_QF, CONDN, FCONDN, 0), -/* v9 */ fmovcc ("fmovsn", FM_SF, CONDN, FCONDN, 0), -/* v9 */ fmovcc ("fmovdne", FM_DF, CONDNE, FCONDNE, 0), -/* v9 */ fmovcc ("fmovqne", FM_QF, CONDNE, FCONDNE, 0), -/* v9 */ fmovcc ("fmovsne", FM_SF, CONDNE, FCONDNE, 0), -/* v9 */ fmovicc ("fmovdneg", FM_DF, CONDNEG, 0), -/* v9 */ fmovicc ("fmovqneg", FM_QF, CONDNEG, 0), -/* v9 */ fmovicc ("fmovsneg", FM_SF, CONDNEG, 0), -/* v9 */ fmovcc ("fmovdnz", FM_DF, CONDNZ, FCONDNZ, F_ALIAS), -/* v9 */ fmovcc ("fmovqnz", FM_QF, CONDNZ, FCONDNZ, F_ALIAS), -/* v9 */ fmovcc ("fmovsnz", FM_SF, CONDNZ, FCONDNZ, F_ALIAS), -/* v9 */ fmovfcc ("fmovdo", FM_DF, FCONDO, 0), -/* v9 */ fmovfcc ("fmovqo", FM_QF, FCONDO, 0), -/* v9 */ fmovfcc ("fmovso", FM_SF, FCONDO, 0), -/* v9 */ fmovicc ("fmovdpos", FM_DF, CONDPOS, 0), -/* v9 */ fmovicc ("fmovqpos", FM_QF, CONDPOS, 0), -/* v9 */ fmovicc ("fmovspos", FM_SF, CONDPOS, 0), -/* v9 */ fmovfcc ("fmovdu", FM_DF, FCONDU, 0), -/* v9 */ fmovfcc ("fmovqu", FM_QF, FCONDU, 0), -/* v9 */ fmovfcc ("fmovsu", FM_SF, FCONDU, 0), -/* v9 */ fmovfcc ("fmovdue", FM_DF, FCONDUE, 0), -/* v9 */ fmovfcc ("fmovque", FM_QF, FCONDUE, 0), -/* v9 */ fmovfcc ("fmovsue", FM_SF, FCONDUE, 0), -/* v9 */ fmovfcc ("fmovdug", FM_DF, FCONDUG, 0), -/* v9 */ fmovfcc ("fmovqug", FM_QF, FCONDUG, 0), -/* v9 */ fmovfcc ("fmovsug", FM_SF, FCONDUG, 0), -/* v9 */ fmovfcc ("fmovduge", FM_DF, FCONDUGE, 0), -/* v9 */ fmovfcc ("fmovquge", FM_QF, FCONDUGE, 0), -/* v9 */ fmovfcc ("fmovsuge", FM_SF, FCONDUGE, 0), -/* v9 */ fmovfcc ("fmovdul", FM_DF, FCONDUL, 0), -/* v9 */ fmovfcc ("fmovqul", FM_QF, FCONDUL, 0), -/* v9 */ fmovfcc ("fmovsul", FM_SF, FCONDUL, 0), -/* v9 */ fmovfcc ("fmovdule", FM_DF, FCONDULE, 0), -/* v9 */ fmovfcc ("fmovqule", FM_QF, FCONDULE, 0), -/* v9 */ fmovfcc ("fmovsule", FM_SF, FCONDULE, 0), -/* v9 */ fmovicc ("fmovdvc", FM_DF, CONDVC, 0), -/* v9 */ fmovicc ("fmovqvc", FM_QF, CONDVC, 0), -/* v9 */ fmovicc ("fmovsvc", FM_SF, CONDVC, 0), -/* v9 */ fmovicc ("fmovdvs", FM_DF, CONDVS, 0), -/* v9 */ fmovicc ("fmovqvs", FM_QF, CONDVS, 0), -/* v9 */ fmovicc ("fmovsvs", FM_SF, CONDVS, 0), -/* v9 */ fmovcc ("fmovdz", FM_DF, CONDZ, FCONDZ, F_ALIAS), -/* v9 */ fmovcc ("fmovqz", FM_QF, CONDZ, FCONDZ, F_ALIAS), -/* v9 */ fmovcc ("fmovsz", FM_SF, CONDZ, FCONDZ, F_ALIAS), +/* v9 */ fmovcc ("a", CONDA, FCONDA, 0), +/* v9 */ fmovicc ("cc", CONDCC, 0), +/* v9 */ fmovicc ("cs", CONDCS, 0), +/* v9 */ fmovcc ("e", CONDE, FCONDE, 0), +/* v9 */ fmovcc ("g", CONDG, FCONDG, 0), +/* v9 */ fmovcc ("ge", CONDGE, FCONDGE, 0), +/* v9 */ fmovicc ("geu", CONDGEU, F_ALIAS), +/* v9 */ fmovicc ("gu", CONDGU, 0), +/* v9 */ fmovcc ("l", CONDL, FCONDL, 0), +/* v9 */ fmovcc ("le", CONDLE, FCONDLE, 0), +/* v9 */ fmovicc ("leu", CONDLEU, 0), +/* v9 */ fmovfcc ("lg", FCONDLG, 0), +/* v9 */ fmovicc ("lu", CONDLU, F_ALIAS), +/* v9 */ fmovcc ("n", CONDN, FCONDN, 0), +/* v9 */ fmovcc ("ne", CONDNE, FCONDNE, 0), +/* v9 */ fmovicc ("neg", CONDNEG, 0), +/* v9 */ fmovcc ("nz", CONDNZ, FCONDNZ, F_ALIAS), +/* v9 */ fmovfcc ("o", FCONDO, 0), +/* v9 */ fmovicc ("pos", CONDPOS, 0), +/* v9 */ fmovfcc ("u", FCONDU, 0), +/* v9 */ fmovfcc ("ue", FCONDUE, 0), +/* v9 */ fmovfcc ("ug", FCONDUG, 0), +/* v9 */ fmovfcc ("uge", FCONDUGE, 0), +/* v9 */ fmovfcc ("ul", FCONDUL, 0), +/* v9 */ fmovfcc ("ule", FCONDULE, 0), +/* v9 */ fmovicc ("vc", CONDVC, 0), +/* v9 */ fmovicc ("vs", CONDVS, 0), +/* v9 */ fmovcc ("z", CONDZ, FCONDZ, F_ALIAS), +#undef fmoviccx /* v9 */ +#undef fmovfccx /* v9 */ +#undef fmovccx /* v9 */ #undef fmovicc /* v9 */ #undef fmovfcc /* v9 */ #undef fmovcc /* v9 */ ==== //depot/projects/hammer/contrib/gcc/config/rs6000/freebsd.h#4 (text+ko) ==== @@ -24,6 +24,12 @@ #undef CPP_OS_DEFAULT_SPEC #define CPP_OS_DEFAULT_SPEC "%(cpp_os_freebsd)" +#undef CPP_OS_FREEBSD_SPEC +#define CPP_OS_FREEBSD_SPEC "\ + -D__PPC__ -D__ppc__ -D__PowerPC__ -D__powerpc__ \ + -Acpu=powerpc -Amachine=powerpc \ + %{fPIC|fpic|fPIE|fpie:-D__PIC__ -D__pic__} " + #undef STARTFILE_DEFAULT_SPEC #define STARTFILE_DEFAULT_SPEC "%(startfile_freebsd)" ==== //depot/projects/hammer/contrib/libpcap/CHANGES#4 (text+ko) ==== @@ -1,4 +1,17 @@ -@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59 2004/03/30 14:42:50 mcr Exp $ (LBL) +@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.1 2005/07/05 21:04:27 mcr Exp $ (LBL) + +Tue. July 5, 2005. ken@xelerance.com. Summary for 3.9.x tcpdump + + Fixes for compiling on nearly every platform, + including improved 64bit support + MSDOS Support + Add support for sending packets + OpenBSD pf format support + IrDA capture (Linux only) + +Tue. May 27, 2005. mcr@sandelman.ottawa.on.ca. Summary for 0.9.1 release + + Numerous fixes for Tue. March 30, 2004. mcr@sandelman.ottawa.on.ca. Summary for 3.8.3 release ==== //depot/projects/hammer/contrib/libpcap/CREDITS#4 (text+ko) ==== @@ -33,6 +33,7 @@ Erik de Castro Lopo Franz Schaefer Gianluca Varenni + Gilbert Hoyek Gisle Vanem Graeme Hewson Greg Stark @@ -58,6 +59,7 @@ Love Hörnquist-Åstrand Maciej W. Rozycki Marcus Felipe Pereira + Mark C. Brown Mark Pizzolato Martin Husemann Matthew Luckie @@ -67,8 +69,10 @@ Octavian Cerna Olaf Kirch Onno van der Linden + Patrick Marie Paul Mundt Pavel Kankovsky + Pawel Pokrywka Peter Fales Peter Jeremy Phil Wood @@ -81,6 +85,7 @@ Solomon Peachy Stefan Hudson Takashi Yamamoto + Tanaka Shin-ya Tony Li Torsten Landschoff Uns Lider ==== //depot/projects/hammer/contrib/libpcap/FILES#4 (text+ko) ==== @@ -12,6 +12,7 @@ README.hpux README.linux README.macosx +README.septel README.tru64 README.Win32 SUNOS4/nit_if.o.sparc @@ -87,6 +88,8 @@ pcap-null.c pcap-pf.c pcap-pf.h +pcap-septel.c +pcap-septel.h pcap-stdinc.h pcap-snit.c pcap-snoop.c @@ -96,7 +99,6 @@ pcap.h pf.h ppp.h -rawss7.h savefile.c scanner.l sll.h ==== //depot/projects/hammer/contrib/libpcap/INSTALL.txt#4 (text+ko) ==== @@ -1,4 +1,4 @@ -@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.12 2004/12/18 08:52:08 guy Exp $ (LBL) +@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.12.2.1 2005/06/20 21:30:14 guy Exp $ (LBL) To build libpcap, run "./configure" (a shell script). The configure script will determine your system attributes and generate an @@ -308,6 +308,7 @@ README.hpux - notes on using libpcap on HP-UX README.linux - notes on using libpcap on Linux README.macosx - notes on using libpcap on Mac OS X +README.septel - notes on using libpcap to capture on Intel/Septel devices README.tru64 - notes on using libpcap on Digital/Tru64 UNIX README.Win32 - notes on using libpcap on Win32 systems (with WinPcap) SUNOS4 - pre-SunOS 4.1 replacement kernel nit modules @@ -363,6 +364,8 @@ pcap-null.c - dummy monitor support (allows offline use of libpcap) pcap-pf.c - Ultrix and Digital/Tru64 UNIX Packet Filter support pcap-pf.h - Ultrix and Digital/Tru64 UNIX Packet Filter definitions +pcap-septel.c - INTEL/Septel device capture support +pcap-septel.h - INTEL/Septel device capture support pcap-stdinc.h - includes and #defines for compiling on Win32 systems pcap-snit.c - SunOS 4.x STREAMS-based Network Interface Tap support pcap-snoop.c - IRIX Snoop network monitoring support ==== //depot/projects/hammer/contrib/libpcap/VERSION#5 (text+ko) ==== @@ -1,1 +1,1 @@ -0.9-PRE-CVS +0.9.1 ==== //depot/projects/hammer/contrib/libpcap/config.h.in#4 (text+ko) ==== @@ -23,8 +23,8 @@ /* Define to 1 if you have the `ether_hostton' function. */ #undef HAVE_ETHER_HOSTTON -/* on HP-UX 10.20 */ -#undef HAVE_HPUX10_20 +/* on HP-UX 10.20 or later */ +#undef HAVE_HPUX10_20_OR_LATER /* on HP-UX 9.x */ #undef HAVE_HPUX9 @@ -53,6 +53,9 @@ /* define if you have a /proc/net/dev */ #undef HAVE_PROC_NET_DEV +/* define if you have a Septel API */ +#undef HAVE_SEPTEL_API + /* Define to 1 if you have the `snprintf' function. */ #undef HAVE_SNPRINTF @@ -83,6 +86,9 @@ /* Define to 1 if you have the `strlcpy' function. */ #undef HAVE_STRLCPY +/* Define to 1 if the system has the type `struct ether_addr'. */ +#undef HAVE_STRUCT_ETHER_ADDR + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_BUFMOD_H ==== //depot/projects/hammer/contrib/libpcap/configure#4 (text+ko) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.120 . +# From configure.in Revision: 1.120.2.6 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.57. # @@ -855,9 +855,10 @@ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --without-gcc don't use gcc --with-pcap=TYPE use packet capture TYPE - --with-dag[=DIR] include Endace DAG support ("yes", "no" or DIR; default="yes" on BSD and Linux if present) + --with-dag[=DIR] include Endace DAG support ("yes", "no" or DIR; default="yes" on BSD and Linux if present) --with-dag-includes=DIR Endace DAG include directory --with-dag-libraries=DIR Endace DAG library directory + --with-septel[=DIR] include Septel support (located in directory DIR, if supplied). default=yes, on Linux, if present --without-flex don't use flex --without-bison don't use bison @@ -2633,10 +2634,6 @@ #include -int -main () -{ - static void foo(void) __attribute__ ((noreturn)); static void @@ -2645,9 +2642,12 @@ exit(1); } - ; - return 0; +int +main(int argc, char **argv) +{ + foo(); } + _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -4416,6 +4416,7 @@ #include #include #include +#include struct mbuf; struct rtentry; #include @@ -4458,26 +4459,14 @@ echo "${ECHO_T}$ac_cv_have_decl_ether_hostton" >&6 if test $ac_cv_have_decl_ether_hostton = yes; then -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_ETHER_HOSTTON 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF #define NETINET_IF_ETHER_H_DECLARES_ETHER_HOSTTON _ACEOF -else - cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_ETHER_HOSTTON 0 -_ACEOF - - fi - fi # # Did that succeed? @@ -4688,27 +4677,101 @@ echo "${ECHO_T}$ac_cv_have_decl_ether_hostton" >&6 if test $ac_cv_have_decl_ether_hostton = yes; then -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_ETHER_HOSTTON 1 + +cat >>confdefs.h <<\_ACEOF +#define NETINET_ETHER_H_DECLARES_ETHER_HOSTTON _ACEOF +fi -cat >>confdefs.h <<\_ACEOF -#define NETINET_ETHER_H_DECLARES_ETHER_HOSTTON + fi + fi + # + # Is ether_hostton() declared? + # + if test "$ac_cv_have_decl_ether_hostton" != yes; then + # + # No, we'll have to declare it ourselves. + # Do we have "struct ether_addr"? + # + echo "$as_me:$LINENO: checking for struct ether_addr" >&5 +echo $ECHO_N "checking for struct ether_addr... $ECHO_C" >&6 +if test "${ac_cv_type_struct_ether_addr+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include +struct mbuf; +struct rtentry; +#include +#include + +int +main () +{ +if ((struct ether_addr *) 0) + return 0; +if (sizeof (struct ether_addr)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_struct_ether_addr=yes else - cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_ETHER_HOSTTON 0 + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_struct_ether_addr=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_struct_ether_addr" >&5 +echo "${ECHO_T}$ac_cv_type_struct_ether_addr" >&6 +if test $ac_cv_type_struct_ether_addr = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_ETHER_ADDR 1 _ACEOF fi - fi +cat >>confdefs.h <<\_ACEOF +#define HAVE_DECL_ETHER_HOSTTON 0 +_ACEOF + + else + +cat >>confdefs.h <<\_ACEOF +#define HAVE_DECL_ETHER_HOSTTON 1 +_ACEOF + fi fi @@ -5433,6 +5496,10 @@ V_DEFS="$V_DEFS -DDAG_ONLY" ;; +septel) + V_DEFS="$V_DEFS -DSEPTEL_ONLY" + ;; + null) { echo "$as_me:$LINENO: WARNING: cannot determine packet capture interface" >&5 echo "$as_me: WARNING: cannot determine packet capture interface" >&2;} @@ -5513,8 +5580,8 @@ case "$V_PCAP" in linux|bpf|dag) # - # We support the DAG API on Linux or BSD, or if we're building a - # DAG-only libpcap. + # We support the DAG API if we're on Linux or BSD, or if we're + # building a DAG-only libpcap. # ;; *) @@ -5540,7 +5607,7 @@ echo "$as_me:$LINENO: checking whether we have DAG API headers" >&5 echo $ECHO_N "checking whether we have DAG API headers... $ECHO_C" >&6 - # If necessary, set default paths for DAG API headers and libraries. + # If necessary, set default paths for DAG API headers and libraries. if test -z "$dag_root"; then dag_root=/usr/local fi @@ -5560,7 +5627,7 @@ if test -r $dag_include_dir/dagapi.h; then ac_cv_lbl_dag_api=yes fi - echo "$as_me:$LINENO: result: $ac_cv_lbl_dag_api ($dag_include_dir)" >&5 + echo "$as_me:$LINENO: result: $ac_cv_lbl_dag_api ($dag_include_dir)" >&5 echo "${ECHO_T}$ac_cv_lbl_dag_api ($dag_include_dir)" >&6 fi @@ -5570,32 +5637,27 @@ echo $ECHO_N "checking dagapi.o... $ECHO_C" >&6 dagapi_obj=no if test -r $dag_tools_dir/dagapi.o; then - - # 2.4.x. + # 2.4.x. dagapi_obj=$dag_tools_dir/dagapi.o - elif test -r $dag_lib_dir/dagapi.o; then - - # 2.5.x. - dagapi_obj=$dag_lib_dir/dagapi.o - - elif test -r $dag_lib_dir/libdag.a; then - - # 2.5.x. + # 2.5.x. + dagapi_obj=$dag_lib_dir/dagapi.o + elif test -r $dag_lib_dir/libdag.a; then + # 2.5.x. ar x $dag_lib_dir/libdag.a dagapi.o if test -r ./dagapi.o; then dagapi_obj=./dagapi.o fi - fi >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jul 11 22:20:11 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DD2A16A41F; Mon, 11 Jul 2005 22:20:10 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 635BB16A41C for ; Mon, 11 Jul 2005 22:20:10 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 296D243D46 for ; Mon, 11 Jul 2005 22:20:10 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6BMK9VV089375 for ; Mon, 11 Jul 2005 22:20:10 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6BMK9dD089372 for perforce@freebsd.org; Mon, 11 Jul 2005 22:20:09 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 11 Jul 2005 22:20:09 GMT Message-Id: <200507112220.j6BMK9dD089372@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 80028 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 22:20:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=80028 Change 80028 by soc-andrew@soc-andrew_serv on 2005/07/11 22:20:02 Welcome in our new HEAD overloard to the BSD Installer Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#9 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.887 2005/07/11 03:59:25 scottl Exp $ +# $FreeBSD: src/release/Makefile,v 1.888 2005/07/11 15:50:29 kensmith Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -18,16 +18,16 @@ # Set these, release builder! # # Fixed version: -#BUILDNAME=6.0-CURRENT +#BUILDNAME=7.0-CURRENT # # Automatic SNAP versioning: DATE != date +%Y%m%d -BASE = 6.0 +BASE = 7.0 BUILDNAME?=${BASE}-${DATE}-SNAP # #CHROOTDIR=/junk/release # If this is a -stable snapshot, then set -#RELEASETAG=RELENG_4 +#RELEASETAG=RELENG_6 # # To test a release with a source tree containing patches and # other work. This tree will get copied instead of getting the From owner-p4-projects@FreeBSD.ORG Mon Jul 11 23:10:12 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32E5A16A421; Mon, 11 Jul 2005 23:10:12 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DE88216A41C for ; Mon, 11 Jul 2005 23:10:11 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C0B3843D58 for ; Mon, 11 Jul 2005 23:10:10 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6BNAAWX091117 for ; Mon, 11 Jul 2005 23:10:10 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6BNAAX7091114 for perforce@freebsd.org; Mon, 11 Jul 2005 23:10:10 GMT (envelope-from peter@freebsd.org) Date: Mon, 11 Jul 2005 23:10:10 GMT Message-Id: <200507112310.j6BNAAX7091114@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 80029 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2005 23:10:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=80029 Change 80029 by peter@peter_daintree on 2005/07/11 23:09:47 Intel -b i386_hammer (this revives some stuff from the grave, I'm not sure how p4 dug this stuff up) Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#25 integrate .. //depot/projects/hammer/sys/amd64/amd64/exception.S#41 integrate .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#29 integrate .. //depot/projects/hammer/sys/amd64/amd64/initcpu.c#14 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#138 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#76 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#74 integrate .. //depot/projects/hammer/sys/amd64/include/_types.h#15 integrate .. //depot/projects/hammer/sys/amd64/include/atomic.h#16 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#45 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#25 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/exception.S#41 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/fpu.c#29 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/initcpu.c#14 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#138 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#76 (text+ko) ==== @@ -359,6 +359,20 @@ return (0); } +/* + * Convert kernel VA to physical address + */ +vm_paddr_t +kvtop(void *addr) +{ + vm_paddr_t pa; + + pa = pmap_kextract((vm_offset_t)addr); + if (pa == 0) + panic("kvtop: zero page frame"); + return (pa); +} + #ifdef SMP static void cpu_reset_proxy() ==== //depot/projects/hammer/sys/amd64/conf/NOTES#74 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# (XXX from i386:NOTES,v 1.1201) +# (XXX from i386:NOTES,v 1.1202) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.36 2005/06/30 05:33:25 peter Exp $ # ==== //depot/projects/hammer/sys/amd64/include/_types.h#15 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/include/atomic.h#16 (text+ko) ==== @@ -152,10 +152,35 @@ return (res); } +#if defined(_KERNEL) && !defined(SMP) + +/* + * We assume that a = b will do atomic loads and stores. However, on a + * PentiumPro or higher, reads may pass writes, so for that case we have + * to use a serializing instruction (i.e. with LOCK) to do the load in + * SMP kernels. For UP kernels, however, the cache of the single processor + * is always consistent, so we don't need any memory barriers. + */ #define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ static __inline u_##TYPE \ atomic_load_acq_##TYPE(volatile u_##TYPE *p) \ { \ + return (*p); \ +} \ + \ +static __inline void \ +atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ +{ \ + *p = v; \ +} \ +struct __hack + +#else /* defined(SMP) */ + +#define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ +static __inline u_##TYPE \ +atomic_load_acq_##TYPE(volatile u_##TYPE *p) \ +{ \ u_##TYPE res; \ \ __asm __volatile(__XSTRING(MPLOCKED) LOP \ @@ -179,6 +204,8 @@ } \ struct __hack +#endif /* SMP */ + #endif /* KLD_MODULE || !(__GNUCLIKE_ASM && __CC_SUPPORTS___INLINE) */ ATOMIC_ASM(set, char, "orb %b1,%0", "iq", v); ==== //depot/projects/hammer/sys/amd64/isa/clock.c#45 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Jul 12 00:26:43 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49CB716A420; Tue, 12 Jul 2005 00:26:43 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1FD5716A41C for ; Tue, 12 Jul 2005 00:26:43 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D18D843D46 for ; Tue, 12 Jul 2005 00:26:42 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6C0QguY098338 for ; Tue, 12 Jul 2005 00:26:42 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6C0QgoC098335 for perforce@freebsd.org; Tue, 12 Jul 2005 00:26:42 GMT (envelope-from peter@freebsd.org) Date: Tue, 12 Jul 2005 00:26:42 GMT Message-Id: <200507120026.j6C0QgoC098335@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 80030 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jul 2005 00:26:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=80030 Change 80030 by peter@peter_daintree on 2005/07/12 00:26:36 No need to revive this. Leave it dead. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#77 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#77 (text+ko) ==== @@ -359,20 +359,6 @@ return (0); } -/* - * Convert kernel VA to physical address - */ -vm_paddr_t -kvtop(void *addr) -{ - vm_paddr_t pa; - - pa = pmap_kextract((vm_offset_t)addr); - if (pa == 0) - panic("kvtop: zero page frame"); - return (pa); -} - #ifdef SMP static void cpu_reset_proxy() From owner-p4-projects@FreeBSD.ORG Tue Jul 12 00:27:45 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF60F16A420; Tue, 12 Jul 2005 00:27:44 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B932E16A41C for ; Tue, 12 Jul 2005 00:27:44 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 898A543D46 for ; Tue, 12 Jul 2005 00:27:44 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6C0RiEw098758 for ; Tue, 12 Jul 2005 00:27:44 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6C0RiIn098755 for perforce@freebsd.org; Tue, 12 Jul 2005 00:27:44 GMT (envelope-from peter@freebsd.org) Date: Tue, 12 Jul 2005 00:27:44 GMT Message-Id: <200507120027.j6C0RiIn098755@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 80031 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jul 2005 00:27:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=80031 Change 80031 by peter@peter_daintree on 2005/07/12 00:27:13 Turn on the ed driver. It appears that its evilness has been purged and it now behaves well.... in theory. Affected files ... .. //depot/projects/hammer/sys/amd64/conf/NOTES#75 edit .. //depot/projects/hammer/sys/conf/files.amd64#74 edit Differences ... ==== //depot/projects/hammer/sys/amd64/conf/NOTES#75 (text+ko) ==== @@ -227,11 +227,10 @@ # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and # Am79C960) -#XXX# still calls MD i386 kvtop function instead of vtophys etc -#XXX#device ed -#XXX#options ED_3C503 -#XXX#options ED_HPP -#XXX#options ED_SIC +device ed +options ED_3C503 +options ED_HPP +options ED_SIC #XXX#device lnc device ath ==== //depot/projects/hammer/sys/conf/files.amd64#74 (text+ko) ==== @@ -136,6 +136,12 @@ dev/atkbdc/atkbdc_isa.c optional atkbdc isa dev/atkbdc/atkbdc_subr.c optional atkbdc dev/atkbdc/psm.c optional psm atkbdc +# There are no systems with isa slots, so all ed isa entries should go.. +dev/ed/if_ed_3c503.c optional ed isa ed_3c503 +dev/ed/if_ed_isa.c optional ed isa +dev/ed/if_ed_wd80x3.c optional ed isa +dev/ed/if_ed_hpp.c optional ed isa ed_hpp +dev/ed/if_ed_sic.c optional ed isa ed_sic dev/fb/fb.c optional fb dev/fb/fb.c optional vga dev/fb/splash.c optional splash From owner-p4-projects@FreeBSD.ORG Tue Jul 12 00:27:46 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 93CD216A430; Tue, 12 Jul 2005 00:27:45 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1318716A432 for ; Tue, 12 Jul 2005 00:27:45 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D7D3A43D46 for ; Tue, 12 Jul 2005 00:27:44 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6C0RiVb098764 for ; Tue, 12 Jul 2005 00:27:44 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6C0RirF098761 for perforce@freebsd.org; Tue, 12 Jul 2005 00:27:44 GMT (envelope-from peter@freebsd.org) Date: Tue, 12 Jul 2005 00:27:44 GMT Message-Id: <200507120027.j6C0RirF098761@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 80032 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jul 2005 00:27:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=80032 Change 80032 by peter@peter_daintree on 2005/07/12 00:27:39 Allocate a stack for handling a double fault and set it on the AP's Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#102 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#102 (text+ko) ==== @@ -95,6 +95,9 @@ /* Free these after use */ void *bootstacks[MAXCPU]; +/* Temporary holder for double fault stack */ +char *doublefault_stack; + /* Hotwire a 0->4MB V==P mapping */ extern pt_entry_t *KPTphys; @@ -432,7 +435,7 @@ common_tss[cpu] = common_tss[0]; common_tss[cpu].tss_rsp0 = 0; /* not used until after switch */ common_tss[cpu].tss_iobase = sizeof(struct amd64tss); - /* XXX set tss_ist1 so we have a stack for a double fault */ + common_tss[cpu].tss_ist1 = (long)&doublefault_stack[PAGE_SIZE]; gdt_segs[GPROC0_SEL].ssd_base = (long) &common_tss[cpu]; ssdtosyssd(&gdt_segs[GPROC0_SEL], @@ -680,7 +683,8 @@ cpu_apic_ids[cpu] = apic_id; /* allocate and set up an idle stack data page */ - bootstacks[cpu] = (char *)kmem_alloc(kernel_map, KSTACK_PAGES * PAGE_SIZE); + bootstacks[cpu] = kmem_alloc(kernel_map, KSTACK_PAGES * PAGE_SIZE); + doublefault_stack = kmem_alloc(kernel_map, PAGE_SIZE); bootSTK = (char *)bootstacks[cpu] + KSTACK_PAGES * PAGE_SIZE - 8; bootAP = cpu; From owner-p4-projects@FreeBSD.ORG Tue Jul 12 01:02:28 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3C6516A420; Tue, 12 Jul 2005 01:02:27 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7A49416A41C for ; Tue, 12 Jul 2005 01:02:27 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1DF9B43D53 for ; Tue, 12 Jul 2005 01:02:27 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6C12QjV007963 for ; Tue, 12 Jul 2005 01:02:27 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6C12Q6T007960 for perforce@freebsd.org; Tue, 12 Jul 2005 01:02:26 GMT (envelope-from peter@freebsd.org) Date: Tue, 12 Jul 2005 01:02:26 GMT Message-Id: <200507120102.j6C12Q6T007960@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 80033 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jul 2005 01:02:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=80033 Change 80033 by peter@peter_daintree on 2005/07/12 01:01:28 Aargh. kmem_alloc returns vm_offset_t Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#103 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#103 (text+ko) ==== @@ -683,8 +683,8 @@ cpu_apic_ids[cpu] = apic_id; /* allocate and set up an idle stack data page */ - bootstacks[cpu] = kmem_alloc(kernel_map, KSTACK_PAGES * PAGE_SIZE); - doublefault_stack = kmem_alloc(kernel_map, PAGE_SIZE); + bootstacks[cpu] = (void *)kmem_alloc(kernel_map, KSTACK_PAGES * PAGE_SIZE); + doublefault_stack = (char *)kmem_alloc(kernel_map, PAGE_SIZE); bootSTK = (char *)bootstacks[cpu] + KSTACK_PAGES * PAGE_SIZE - 8; bootAP = cpu; From owner-p4-projects@FreeBSD.ORG Tue Jul 12 04:17:21 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57AC216A420; Tue, 12 Jul 2005 04:17:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2157016A41C for ; Tue, 12 Jul 2005 04:17:21 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E69DE43D45 for ; Tue, 12 Jul 2005 04:17:20 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6C4HKZY018494 for ; Tue, 12 Jul 2005 04:17:20 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6C4HKlD018491 for perforce@freebsd.org; Tue, 12 Jul 2005 04:17:20 GMT (envelope-from soc-andrew@freebsd.org) Date: Tue, 12 Jul 2005 04:17:20 GMT Message-Id: <200507120417.j6C4HKlD018491@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 80034 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jul 2005 04:17:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=80034 Change 80034 by soc-andrew@soc-andrew_serv on 2005/07/12 04:16:30 Get the location of the distributions from uname(3) and add logging Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/backend/fn_install_freebsd.c#2 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/backend/fn_install_freebsd.c#2 (text+ko) ==== @@ -43,6 +43,9 @@ * It is based on the DragonFlyBSD version of fn_install_os */ +#include + +#include #include #ifdef ENABLE_NLS @@ -155,11 +158,19 @@ } int -do_install(struct i_fn_args *a __unused) +do_install(struct i_fn_args *a) { - dist_set_base("/usr/6.0-20050708-BSDINSTALLER"); + char base[PATH_MAX]; + struct utsname name; + uname(&name); + + snprintf(base, PATH_MAX, "/usr/%s", name.release); + + i_log(a, "<<< Extracting distrubutions from %s", base); + dist_set_base(base); dist_set_location("/mnt"); dist_extract("base"); + i_log(a, ">>> Done"); return 1; } From owner-p4-projects@FreeBSD.ORG Tue Jul 12 14:40:17 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1478C16A420; Tue, 12 Jul 2005 14:40:17 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD7DA16A41C for ; Tue, 12 Jul 2005 14:40:16 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9849B43D45 for ; Tue, 12 Jul 2005 14:40:16 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6CEeG2G065351 for ; Tue, 12 Jul 2005 14:40:16 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6CEeGLb065348 for perforce@freebsd.org; Tue, 12 Jul 2005 14:40:16 GMT (envelope-from soc-andrew@freebsd.org) Date: Tue, 12 Jul 2005 14:40:16 GMT Message-Id: <200507121440.j6CEeGLb065348@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 80041 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jul 2005 14:40:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=80041 Change 80041 by soc-andrew@soc-andrew_serv on 2005/07/12 14:40:16 Display a progress bar during the installation of each distribution. Add more comments to the code I've added to aid maintenance. Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/installer/dist.c#4 edit .. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/installer/dist.h#3 edit .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/backend/fn_install_freebsd.c#3 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/installer/dist.c#4 (text+ko) ==== @@ -40,6 +40,9 @@ static char base[PATH_MAX]; static char location[PATH_MAX]; +struct dfui_progress *pr = NULL; +struct dfui_connection *conn = NULL; +int cancelled = 0; static void dist_change_file_callback(int, char *); @@ -50,40 +53,58 @@ */ struct inf_file * inf_read(const char *dir, const char *dist) { - int fd, chunk; + int fd, chunk, pieces; properties dist_attr = NULL; - struct inf_file *inf = malloc(sizeof(struct inf_file)); + struct inf_file *inf; char *tmp; char file[PATH_MAX]; + /* Set file to the location of the .inf file */ snprintf(file, PATH_MAX, "%s/%s/%s.inf", base, dir, dist); + /* Open the file */ fd = open(file, O_RDONLY); - if (fd == -1) + if (fd == -1) { + /* XXX */ return NULL; + } + /* Read the .inf and close */ dist_attr = properties_read(fd); close(fd); tmp = property_find(dist_attr, "Pieces"); if (tmp == NULL) { /* XXX Bad file */ - free(inf); properties_free(dist_attr); return NULL; } - inf->pieces = strtol(tmp, (char **)NULL, 10); - if (inf->pieces <= 0 || inf->pieces == LONG_MAX) { + + pieces = strtol(tmp, (char **)NULL, 10); + if (pieces <= 0 || pieces == LONG_MAX) { /* XXX Bad file */ - free(inf); + properties_free(dist_attr); + return NULL; + } + + inf = malloc(sizeof(struct inf_file)); + if (inf == NULL) { + /* XXX Out of memory */ properties_free(dist_attr); return NULL; } + inf->pieces = pieces; inf->dir = strdup(dir); inf->dist = strdup(dist); inf->file = malloc(sizeof(struct file) * inf->pieces); + if (inf->file == NULL) { + /* XXX Out of memory */ + inf_free(inf); + properties_free(dist_attr); + return NULL; + } for (chunk = 0; chunk < inf->pieces; chunk++) { @@ -118,6 +139,9 @@ return inf; } +/* + * Free the struct inf_file + */ void inf_free(struct inf_file *f) { int chunk; @@ -141,17 +165,26 @@ free(f); } +/* + * Update the progress bar for the current + * when the current file changes. + */ static void dist_change_file_callback(int pcnt, char *name) { - printf("%d%%", pcnt); - if (name) - printf(" %s", name); + /* Set the progress bar to pcnd % */ + dfui_progress_set_amount(pr, pcnt); + + /* Set the description to the current file */ + if (name != NULL) + dfui_info_set_short_desc(dfui_progress_get_info(pr), name); - putchar('\n'); + /* Update the progress bar */ + if (!dfui_be_progress_update(conn, pr, &cancelled)) + abort_backend(); } -void -dist_extract(const char *dist) { +int +dist_extract(struct dfui_connection *c, const char *dist) { struct inf_file * inf; struct archive *a; struct archive_entry *entry; @@ -170,9 +203,19 @@ } if (inf == NULL) { /* XXX Problem with inf file */ - return; + return 1; } + pr = dfui_progress_new(dfui_info_new( + "Extracting", + "No file", + ""), + 0); + + if (!dfui_be_progress_begin(c, pr)) + abort_backend(); + conn = c; + a = archive_read_new(); archive_read_support_compression_all(a); archive_read_support_format_all(a); @@ -181,7 +224,8 @@ printf("ERROR: %s\n", archive_error_string(a)); archive_read_finish(a); inf_free(inf); - return; + dfui_progress_free(pr); + return 1; } chdir(location); @@ -190,11 +234,13 @@ archive_read_data_skip(a); } - chdir(cwd); - archive_read_finish(a); + chdir(cwd); inf_free(inf); + dfui_progress_free(pr); + + return 0; } void ==== //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/installer/dist.h#3 (text+ko) ==== @@ -28,6 +28,8 @@ #ifndef _INSTALLER_DIST_H_ #define _INSTALLER_DIST_H_ +#include + struct file { char *checksum; int length; @@ -42,7 +44,7 @@ struct inf_file *inf_read(const char *, const char *); void inf_free(struct inf_file *); -void dist_extract(const char *); +int dist_extract(struct dfui_connection *, const char *); void dist_set_base(const char *); void dist_set_location(const char *); ==== //depot/projects/soc2005/bsdinstaller/src/usr.sbin/bsdinstaller/backend/fn_install_freebsd.c#3 (text+ko) ==== @@ -169,7 +169,7 @@ i_log(a, "<<< Extracting distrubutions from %s", base); dist_set_base(base); dist_set_location("/mnt"); - dist_extract("base"); + dist_extract(a->c, "base"); i_log(a, ">>> Done"); return 1; } @@ -352,10 +352,12 @@ void fn_install_os(struct i_fn_args *a) { + i_log(a, "1111"); pre_install(a); - + i_log(a, "2222"); do_install(a); - + i_log(a, "3333"); post_install(a); + i_log(a, "4444"); } From owner-p4-projects@FreeBSD.ORG Tue Jul 12 18:36:41 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B04516A462; Tue, 12 Jul 2005 18:36:41 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE93116A444 for ; Tue, 12 Jul 2005 18:36:40 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D49743D49 for ; Tue, 12 Jul 2005 18:36:40 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6CIaeVt081330 for ; Tue, 12 Jul 2005 18:36:40 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6CIae5R081325 for perforce@freebsd.org; Tue, 12 Jul 2005 18:36:40 GMT (envelope-from soc-bushman@freebsd.org) Date: Tue, 12 Jul 2005 18:36:40 GMT Message-Id: <200507121836.j6CIae5R081325@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 80049 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jul 2005 18:36:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=80049 Change 80049 by soc-bushman@soc-bushman_stinger on 2005/07/12 18:35:59 bugfix in files_servent + testing system Affected files ... .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getservent.c#10 edit .. //depot/projects/soc2005/nsswitch_cached/tests/common/Makefile#1 add .. //depot/projects/soc2005/nsswitch_cached/tests/common/debug.c#1 add .. //depot/projects/soc2005/nsswitch_cached/tests/common/debug.h#1 add .. //depot/projects/soc2005/nsswitch_cached/tests/common/test.c#1 add .. //depot/projects/soc2005/nsswitch_cached/tests/common/test.h#1 add .. //depot/projects/soc2005/nsswitch_cached/tests/common_test/Makefile#1 add .. //depot/projects/soc2005/nsswitch_cached/tests/common_test/common_test.c#1 add .. //depot/projects/soc2005/nsswitch_cached/tests/getservent/getservent.c#5 delete .. //depot/projects/soc2005/nsswitch_cached/tests/getservent/libc_private.h#2 delete .. //depot/projects/soc2005/nsswitch_cached/tests/getservent/namespace.h#2 delete .. //depot/projects/soc2005/nsswitch_cached/tests/getservent/netdb_private.h#2 delete .. //depot/projects/soc2005/nsswitch_cached/tests/getservent/nss_tls.h#2 delete .. //depot/projects/soc2005/nsswitch_cached/tests/getservent/reentrant.h#2 delete .. //depot/projects/soc2005/nsswitch_cached/tests/getservent/un-namespace.h#2 delete .. //depot/projects/soc2005/nsswitch_cached/tests/getservent_test/Makefile#1 add .. //depot/projects/soc2005/nsswitch_cached/tests/getservent_test/getservent.c#1 add .. //depot/projects/soc2005/nsswitch_cached/tests/getservent_test/getservent.h#1 add .. //depot/projects/soc2005/nsswitch_cached/tests/getservent_test/getservent_test.c#1 add Differences ... ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getservent.c#10 (text+ko) ==== @@ -352,7 +352,7 @@ continue; } - rv = servent_unpack(line, serv, aliases, aliases_size, errnop); + rv = servent_unpack(buffer, serv, aliases, aliases_size, errnop); if (rv !=0 ) { if (*errnop == 0) { rv = NS_NOTFOUND; @@ -391,12 +391,12 @@ } while (!(rv & NS_TERMINATE)); - if (!stayopen && st->fp!=NULL) { + if (!stayopen && st->fp != NULL) { fclose(st->fp); st->fp = NULL; } - if ((rv ==NS_SUCCESS) && (retval != NULL)) + if ((rv == NS_SUCCESS) && (retval != NULL)) *(struct servent **)retval=serv; return (rv); @@ -423,7 +423,11 @@ st->stayopen |= f; break; case ENDSERVENT: - st->stayopen = 0; + if (st->fp != NULL) { + fclose(st->fp); + st->fp = NULL; + } + st->stayopen = 0; break; default: break; From owner-p4-projects@FreeBSD.ORG Tue Jul 12 20:30:59 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15D7316A420; Tue, 12 Jul 2005 20:30:59 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DF4CC16A41C for ; Tue, 12 Jul 2005 20:30:58 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF73743D49 for ; Tue, 12 Jul 2005 20:30:58 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6CKUwFx085171 for ; Tue, 12 Jul 2005 20:30:58 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6CKUwAq085168 for perforce@freebsd.org; Tue, 12 Jul 2005 20:30:58 GMT (envelope-from peter@freebsd.org) Date: Tue, 12 Jul 2005 20:30:58 GMT Message-Id: <200507122030.j6CKUwAq085168@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 80051 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jul 2005 20:30:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=80051 Change 80051 by peter@peter_overcee on 2005/07/12 20:30:33 Check in some WIP code that we're experimenting with (default off) at work to see if we're seeing a 4K/2M page alias problem when atomic ops are mixed in. This allows an expensive 4.x style temporary ephemeral mapping for each operation. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/uio_machdep.c#5 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/uio_machdep.c#5 (text+ko) ==== @@ -48,6 +48,10 @@ #include #include +#ifdef NODMAP +#include +#include +#endif #include @@ -65,11 +69,17 @@ size_t cnt; int error = 0; int save = 0; +#ifdef NODMAP + vm_offset_t kva; +#endif KASSERT(uio->uio_rw == UIO_READ || uio->uio_rw == UIO_WRITE, ("uiomove_fromphys: mode")); KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread, ("uiomove_fromphys proc")); +#ifdef NODMAP + kva = kmem_alloc_nofault(kernel_map, PAGE_SIZE); +#endif save = td->td_pflags & TDP_DEADLKTREAT; td->td_pflags |= TDP_DEADLKTREAT; while (n > 0 && uio->uio_resid) { @@ -84,8 +94,13 @@ cnt = n; page_offset = offset & PAGE_MASK; cnt = min(cnt, PAGE_SIZE - page_offset); +#ifdef NODMAP + pmap_kenter(kva, VM_PAGE_TO_PHYS(ma[offset >> PAGE_SHIFT])); + cp = (char *)kva + page_offset; +#else cp = (char *)PHYS_TO_DMAP(ma[offset >> PAGE_SHIFT]->phys_addr) + page_offset; +#endif switch (uio->uio_segflg) { case UIO_USERSPACE: if (ticks - PCPU_GET(switchticks) >= hogticks) @@ -106,6 +121,9 @@ case UIO_NOCOPY: break; } +#ifdef NODMAP + pmap_kremove(kva); +#endif iov->iov_base = (char *)iov->iov_base + cnt; iov->iov_len -= cnt; uio->uio_resid -= cnt; @@ -116,5 +134,8 @@ out: if (save == 0) td->td_pflags &= ~TDP_DEADLKTREAT; +#ifdef NODMAP + kmem_free(kernel_map, kva, PAGE_SIZE); +#endif return (error); } From owner-p4-projects@FreeBSD.ORG Tue Jul 12 21:25:05 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7925916A420; Tue, 12 Jul 2005 21:25:04 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4C2F716A41C for ; Tue, 12 Jul 2005 21:25:04 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 184C943D49 for ; Tue, 12 Jul 2005 21:25:04 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6CLP33S095855 for ; Tue, 12 Jul 2005 21:25:03 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6CLP3AX095852 for perforce@freebsd.org; Tue, 12 Jul 2005 21:25:03 GMT (envelope-from peter@freebsd.org) Date: Tue, 12 Jul 2005 21:25:03 GMT Message-Id: <200507122125.j6CLP3AX095852@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 80052 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jul 2005 21:25:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=80052 Change 80052 by peter@peter_melody on 2005/07/12 21:24:46 oops, use tlb coherent mappings. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/uio_machdep.c#6 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/uio_machdep.c#6 (text+ko) ==== @@ -95,7 +95,7 @@ page_offset = offset & PAGE_MASK; cnt = min(cnt, PAGE_SIZE - page_offset); #ifdef NODMAP - pmap_kenter(kva, VM_PAGE_TO_PHYS(ma[offset >> PAGE_SHIFT])); + pmap_qenter(kva, &ma[offset >> PAGE_SHIFT], 1); cp = (char *)kva + page_offset; #else cp = (char *)PHYS_TO_DMAP(ma[offset >> PAGE_SHIFT]->phys_addr) + @@ -122,7 +122,7 @@ break; } #ifdef NODMAP - pmap_kremove(kva); + pmap_qremove(kva, 1); #endif iov->iov_base = (char *)iov->iov_base + cnt; iov->iov_len -= cnt; From owner-p4-projects@FreeBSD.ORG Tue Jul 12 21:50:36 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CDBDE16A420; Tue, 12 Jul 2005 21:50:35 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7B9D716A41C for ; Tue, 12 Jul 2005 21:50:35 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 395E743D45 for ; Tue, 12 Jul 2005 21:50:35 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6CLoZZX097064 for ; Tue, 12 Jul 2005 21:50:35 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6CLoZsa097061 for perforce@freebsd.org; Tue, 12 Jul 2005 21:50:35 GMT (envelope-from peter@freebsd.org) Date: Tue, 12 Jul 2005 21:50:35 GMT Message-Id: <200507122150.j6CLoZsa097061@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 80053 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jul 2005 21:50:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=80053 Change 80053 by peter@peter_melody on 2005/07/12 21:49:47 Don't leave a stray mapping behind in EFAULT error cases. Should be harmless, but there is no need to invite trouble. Unmap at the end rather than in the loop. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/uio_machdep.c#7 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/uio_machdep.c#7 (text+ko) ==== @@ -121,9 +121,6 @@ case UIO_NOCOPY: break; } -#ifdef NODMAP - pmap_qremove(kva, 1); -#endif iov->iov_base = (char *)iov->iov_base + cnt; iov->iov_len -= cnt; uio->uio_resid -= cnt; @@ -135,6 +132,7 @@ if (save == 0) td->td_pflags &= ~TDP_DEADLKTREAT; #ifdef NODMAP + pmap_qremove(kva, 1); kmem_free(kernel_map, kva, PAGE_SIZE); #endif return (error); From owner-p4-projects@FreeBSD.ORG Wed Jul 13 09:00:04 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91C4A16A420; Wed, 13 Jul 2005 09:00:03 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 61C5016A41C for ; Wed, 13 Jul 2005 09:00:03 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 338C143D45 for ; Wed, 13 Jul 2005 09:00:03 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6D902Cv045713 for ; Wed, 13 Jul 2005 09:00:03 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6D902Md045710 for perforce@freebsd.org; Wed, 13 Jul 2005 09:00:02 GMT (envelope-from soc-andrew@freebsd.org) Date: Wed, 13 Jul 2005 09:00:02 GMT Message-Id: <200507130900.j6D902Md045710@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 80060 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jul 2005 09:00:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=80060 Change 80060 by soc-andrew@soc-andrew_serv on 2005/07/13 08:59:40 Set the kern.geom.debugflags=16 to enable the mbr to be written Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#10 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#10 (text+ko) ==== @@ -782,6 +782,7 @@ @echo "cron_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf @echo "devd_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf @echo "syslogd_enable=\"NO\"" >> ${RD}/bsdinstaller/root/etc/rc.conf + @echo "kern.geom.debugflags=16" >> ${RD}/bsdinstaller/root/etc/sysctl.conf @cat ${.CURDIR}/bsdinstaller/gettytab >> ${RD}/bsdinstaller/root/etc/gettytab ( if [ -f ${.CURDIR}/bsdinstaller/ttys.${TARGET_ARCH} ]; then \ cp ${.CURDIR}/bsdinstaller/ttys.${TARGET_ARCH} \ From owner-p4-projects@FreeBSD.ORG Wed Jul 13 10:45:12 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E479316A420; Wed, 13 Jul 2005 10:45:11 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A2FEB16A41C for ; Wed, 13 Jul 2005 10:45:11 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B26643D53 for ; Wed, 13 Jul 2005 10:45:11 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6DAjBQF050214 for ; Wed, 13 Jul 2005 10:45:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6DAjBvr050211 for perforce@freebsd.org; Wed, 13 Jul 2005 10:45:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 13 Jul 2005 10:45:11 GMT Message-Id: <200507131045.j6DAjBvr050211@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 80063 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jul 2005 10:45:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=80063 Change 80063 by rwatson@rwatson_paprika on 2005/07/13 10:44:48 Annotate need for lockign in kern_bsm_klib.c due to dynamic data structures associated with event information. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_klib.c#9 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_klib.c#9 (text+ko) ==== @@ -38,7 +38,10 @@ #include /* - * Hash table functions for the audit event number to event class mask mapping. + * Hash table functions for the audit event number to event class mask + * mapping. + * + * XXXAUDIT: Locking? */ #define EVCLASSMAP_HASH_TABLE_SIZE 251 From owner-p4-projects@FreeBSD.ORG Wed Jul 13 11:03:35 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 817D016A420; Wed, 13 Jul 2005 11:03:34 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3C68816A41C for ; Wed, 13 Jul 2005 11:03:34 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E7CC943D46 for ; Wed, 13 Jul 2005 11:03:33 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6DB3XVw051035 for ; Wed, 13 Jul 2005 11:03:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6DB3Xlh051032 for perforce@freebsd.org; Wed, 13 Jul 2005 11:03:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 13 Jul 2005 11:03:33 GMT Message-Id: <200507131103.j6DB3Xlh051032@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 80064 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jul 2005 11:03:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=80064 Change 80064 by rwatson@rwatson_paprika on 2005/07/13 11:03:29 A number of annotations for consideration in future cleanup: - Might be good to use UMA for per-thread and per-record storage, rather than malloc. - Active credential and vnode are thread-local variables. - Annotate some error choices. - Minor style tweaks. - Annotate odd, fixable, improper, or otherwise interesting use of error handling. FreeBSD does not permit M_WAITOK to fail for some memory types, and that lack of that failure can clean up quite a bit of logic here. - Annotate possible spots to remove Giant due to MPSAFE VFS. Annotate lack of locking in the netinet interactions. - Comment about calculation of free space. - Summary comments for audit_worker(), audit_init(), audit_rotate_vnode(), currecord(), audit_syscall_enter(), audit_syscall_exit(), as well as potential issues with them. - Comments about places to possibly add assertions. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#26 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#26 (text+ko) ==== @@ -55,6 +55,10 @@ #include #include +/* + * XXXAUDIT: Might be nice to use a UMA zone for records, and malloc(9) only + * for things like triggers, temporary storage, etc. + */ MALLOC_DEFINE(M_AUDIT, "audit", "Audit event records"); #ifdef AUDIT @@ -134,6 +138,8 @@ * replacement. When a replacement is completed, this cv is signalled * by the worker thread so a waiting thread can start another replacement. * We also store a credential to perform audit log write operations with. + * + * The current credential and vnode are thread-local to audit_worker. */ static struct cv audit_replacement_cv; @@ -211,6 +217,9 @@ error = 0; audit_isopen = 1; } else { + /* + * XXXRW: Why not EBUSY? + */ error = EOPNOTSUPP; } mtx_unlock(&audit_mtx); @@ -263,10 +272,15 @@ static int audit_write(struct cdev *dev, struct uio *uio, int ioflag) { + /* Communication is kernel->userspace only */ return EOPNOTSUPP; } +/* + * XXXAUDIT: Since we can't fail this call, we should not have a return + * value. + */ static int send_trigger(unsigned int trigger) { @@ -276,6 +290,9 @@ if (!audit_isopen) return 0; + /* + * XXXAUDIT: Use a condition variable instead of msleep/wakeup? + */ ti = malloc(sizeof *ti, M_AUDIT, M_WAITOK); mtx_lock(&audit_mtx); ti->trigger = trigger; @@ -294,9 +311,13 @@ .d_name = "audit" }; +/* + * XXXAUDIT: For consistency, perhaps audit_record_free()? + */ static void audit_free(struct kaudit_record *ar) { + if (ar->k_ar.ar_arg_upath1 != NULL) { free(ar->k_ar.ar_arg_upath1, M_AUDIT); } @@ -318,6 +339,13 @@ free(ar, M_AUDIT); } +/* + * XXXAUDIT: Should adjust comments below to make it clear that we get to + * this point only if we believe we have storage, so not having space here + * is a violation of invariants derived from administrative procedures. + * I.e., someone else has written to the audit partition, leaving less space + * than we accounted for. + */ static int audit_record_write(struct vnode *vp, struct kaudit_record *ar, struct ucred *cred, struct thread *td) @@ -328,6 +356,9 @@ struct vattr vattr; struct statfs *mnt_stat = &vp->v_mount->mnt_stat; + /* + * XXXAUDIT: In the world of MPSAFE VFS, this may not be necessary. + */ mtx_assert(&Giant, MA_OWNED); /* @@ -385,6 +416,8 @@ /* * Send a message to the audit daemon that disk space * is getting low. + * + * XXXAUDIT: Check math and block size calculation here. */ if (audit_qctrl.aq_minfree != 0) { temp = mnt_stat->f_blocks / (100 / @@ -463,6 +496,10 @@ goto out; } + /* + * XXXAUDIT: Should we actually allow this conversion to fail? With + * sleeping memory allocation and invariants checks, perhaps not. + */ ret = kaudit_to_bsm(ar, &bsm); if (ret == BSM_NOAUDIT) { ret = 0; @@ -486,6 +523,8 @@ * away from the BSM record generation and have the BSM generation * done before this function is called. This function will then * take the BSM record as a parameter. + * + * XXXRW: In the new world order, this is no longer true. */ ret = (vn_rdwr(UIO_WRITE, vp, (void *)bsm->data, bsm->len, (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, cred, NULL, NULL, td)); @@ -510,6 +549,16 @@ return (ret); } +/* + * The audit_worker thread is responsible for watching the event queue, + * dequeueing records, converting them to BSM format, and committing them to + * disk. In order to minimize lock thrashing, records are dequeued in sets + * to a thread-local work queue. In addition, the audit_work performs the + * actual exchange of audit log vnode pointer, as audit_vp is a thread-local + * variable. + * + * XXXAUDIT: Giant is now less required here. + */ static void audit_worker(void *arg) { @@ -649,6 +698,8 @@ * with the audit_mtx held, to avoid a lock order reversal * as free() may grab Giant. This should be fixed at * some point. + * + * XXXAUDIT: free() no longer grabs Giant. */ while ((ar = TAILQ_FIRST(&audit_q))) { TAILQ_REMOVE(&audit_q, ar, k_q); @@ -691,6 +742,11 @@ } } +/* + * Initialize the Audit subsystem: configuration state, work queue, + * synchronization primitives, worker thread, and trigger device node. Also + * call into the BSM assembly code to initialize it. + */ void audit_init(void) { @@ -735,6 +791,26 @@ SYSINIT(audit_init, SI_SUB_AUDIT, SI_ORDER_FIRST, audit_init, NULL) +/* + * audit_rotate_vnode() is called by a user or kernel thread to configure or + * de-configure auditing on a vnode. The arguments are the replacement + * credential and vnode to substitute for the current credential and vnode, + * if any. If either is set to NULL, both should be NULL, and this is used + * to indicate that audit is being disabled. The real work is done in the + * audit_worker thread, but audit_rotate_vnode() waits synchronously for that + * to complete. + * + * The vnode should be referenced and opened by the caller. The credential + * should be referenced. audit_rotate_vnode() will own both references as of + * this call, so the caller should not release either. + * + * XXXAUDIT: Review synchronize communication logic. Really, this is a + * message queue of depth 1. + * + * XXXAUDIT: Enhance the comments below to indicate that we are basically + * acquiring ownership of the communications queue, inserting our message, + * and waiting for an acknowledgement. + */ static void audit_rotate_vnode(struct ucred *cred, struct vnode *vp) { @@ -775,6 +851,8 @@ /* XXX Need to figure out how the kernel->userspace file full * signalling will take place. + * + * XXXAUDIT: This comment may now be obsolete. */ audit_file_rotate_wait = 0; /* We can now request another rotation */ } @@ -785,12 +863,17 @@ void audit_shutdown(void) { + audit_rotate_vnode(NULL, NULL); } +/* + * Return the current thread's audit record, if any. + */ static __inline__ struct kaudit_record * currecord(void) { + return (curthread->td_ar); } @@ -833,9 +916,12 @@ /* This is not very efficient; we're required to allocate * a complete kernel audit record just so the user record * can tag along. + * + * XXXAUDIT: Maybe AUE_AUDIT in the system call context and + * special pre-select handling? */ td->td_ar = audit_new(AUE_NULL, td); - if (td->td_ar == NULL) /*auditing not on, or memory error */ + if (td->td_ar == NULL) return (ENOTSUP); ar = td->td_ar; } @@ -858,6 +944,9 @@ /* Attach the user audit record to the kernel audit record. Because * this system call is an auditable event, we will write the user * record along with the record for this audit event. + * + * XXXAUDIT: KASSERT appropriate starting values of k_udata, k_ulen, + * k_ar_commit & AR_COMMIT_USER? */ ar->k_udata = rec; ar->k_ulen = uap->length; @@ -921,6 +1010,8 @@ /* XXX Need to implement these commands by accessing the global * values associated with the commands. + * + * XXXAUDIT: Locking? */ switch (uap->cmd) { case A_GETPOLICY: @@ -1004,6 +1095,8 @@ case A_GETPINFO: if (udata.au_aupinfo.ap_pid < 1) return (EINVAL); + + /* XXXAUDIT: p_cansee()? */ if ((tp = pfind(udata.au_aupinfo.ap_pid)) == NULL) return (EINVAL); @@ -1022,6 +1115,8 @@ case A_SETPMASK: if (udata.au_aupinfo.ap_pid < 1) return (EINVAL); + + /* XXXAUDIT: p_cansee()? */ if ((tp = pfind(udata.au_aupinfo.ap_pid)) == NULL) return (EINVAL); @@ -1129,6 +1224,10 @@ /* * XXX: * Integer write on static pointer dereference: doesn't need locking? + * + * XXXAUDIT: Might need locking to serialize audit events in the same + * order as change events? Or maybe that's an under-solveable + * problem. */ PROC_LOCK(td->td_proc); td->td_proc->p_au->ai_auid = id; @@ -1237,10 +1336,15 @@ * If a path is specified, open the replacement vnode, perform * validity checks, and grab another reference to the current * credential. + * + * XXXAUDIT: On Darwin, a NULL path is used to disable audit. */ if (uap->path == NULL) return (EINVAL); + /* + * XXXAUDIT: Giant may no longer be required here. + */ mtx_lock(&Giant); NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE, uap->path, td); flags = audit_open_flags; @@ -1259,6 +1363,11 @@ } cred = td->td_ucred; crhold(cred); + + /* + * XXXAUDIT: Should audit_suspended actually be cleared by + * audit_worker? + */ audit_suspended = 0; mtx_unlock(&Giant); @@ -1274,6 +1383,13 @@ /* * MPSAFE + * + * XXXAUDIT: There are a number of races present in the code below due to + * release and re-grab of the mutex. The code should be revised to become + * slightly less racy. + * + * XXXAUDIT: Shouldn't there be logic here to sleep waiting on available + * pre_q space, suspending the system call until there is room? */ struct kaudit_record * audit_new(int event, struct thread *td) @@ -1306,7 +1422,7 @@ * XXX: We may want to fail-stop if allocation fails. * XXX: The number of outstanding uncommitted audit records is * limited by the number of concurrent threads servicing system - * calls in the kernel. + * calls in the kernel. */ ar = malloc(sizeof(*ar), M_AUDIT, M_WAITOK); @@ -1322,7 +1438,12 @@ ar->k_ar.ar_event = event; nanotime(&ar->k_ar.ar_starttime); - /* Export the subject credential. */ + /* + * Export the subject credential. + * + * XXXAUDIT: td_ucred access is OK without proc lock, but some other + * fields here may require the proc lock. + */ cru2x(td->td_ucred, &ar->k_ar.ar_subj_cred); ar->k_ar.ar_subj_ruid = td->td_ucred->cr_ruid; ar->k_ar.ar_subj_rgid = td->td_ucred->cr_rgid; @@ -1332,6 +1453,7 @@ ar->k_ar.ar_subj_pid = td->td_proc->p_pid; ar->k_ar.ar_subj_amask = td->td_proc->p_au->ai_mask; ar->k_ar.ar_subj_term = td->td_proc->p_au->ai_termid; + bcopy(td->td_proc->p_comm, ar->k_ar.ar_subj_comm, MAXCOMLEN); return (ar); @@ -1366,7 +1488,9 @@ /* * Decide whether to commit the audit record by checking the * error value from the system call and using the appropriate - * audit mask. + * audit mask. + * + * XXXAUDIT: Synchronize access to audit_nae_mask? */ if (ar->k_ar.ar_subj_auid == AU_DEFAUDITID) aumask = &audit_nae_mask; @@ -1457,8 +1581,10 @@ } /* - * Calls to set up and tear down audit structures associated with - * each system call. + * audit_syscall_enter() is called on entry to eatch system call. It is + * responsible for deciding whether or not to audit the call (preselection), + * and if so, allocating a per-thread audit record. audit_new() will fill in + * basic thread/credential properties. */ void audit_syscall_enter(unsigned short code, struct thread *td) @@ -1466,12 +1592,17 @@ int audit_event; struct au_mask *aumask; + KASSERT(td->td_ar == NULL, ("audit_syscall_enter: td->td_ar != NULL")); + /* * In FreeBSD, each ABI has its own system call table, and hence * mapping of system call codes to audit events. Convert the code to * an audit event identifier using the process system call table * reference. In Darwin, there's only one, so we use the global * symbol for the system call table. + * + * XXXAUDIT: Should we audit that a bad system call was made, and if + * so, how? */ if (code >= td->td_proc->p_sysent->sv_size) return; @@ -1480,9 +1611,8 @@ if (audit_event == AUE_NULL) return; - KASSERT(td->td_ar == NULL, ("audit_syscall_enter: td->td_ar != NULL")); - - /* Check which audit mask to use; either the kernel non-attributable + /* + * Check which audit mask to use; either the kernel non-attributable * event mask or the process audit mask. */ if (td->td_proc->p_au->ai_auid == AU_DEFAUDITID) @@ -1500,6 +1630,13 @@ * If we're out of space and need to suspend unprivileged * processes, do that here rather than trying to allocate * another audit record. + * + * XXXRW: We might wish to be able to continue here in the + * future, if the system recovers. That should be possible + * by means of checking the condition in a loop around + * cv_wait(). It might be desirable to reevaluate whether an + * audit record is still required for this event by + * re-calling au_preselect(). */ if (audit_in_failure && suser(td) != 0) { cv_wait(&audit_fail_cv, &audit_mtx); @@ -1510,6 +1647,11 @@ td->td_ar = NULL; } +/* + * audit_syscall_exit() is called from the return of every system call, or in + * the event of exit1(), during the execution of exit1(). It is responsible + * for committing the audit record, if any, along with return condition. + */ void audit_syscall_exit(int error, struct thread *td) { @@ -1543,6 +1685,9 @@ * check the thread audit record pointer anyway, as the audit condition * could change, and pre-selection may not have allocated an audit * record for this event. + * + * XXXAUDIT: Should we assert, in each case, that this field of the record + * hasn't already been filled in? */ void audit_arg_addr(void * addr) @@ -1768,7 +1913,9 @@ if ((ar == NULL) || (p == NULL)) return; - /* XXX May need to lock the credentials structures */ + /* + * XXXAUDIT: PROC_LOCK_ASSERT(p); + */ ar->k_ar.ar_arg_auid = p->p_au->ai_auid; ar->k_ar.ar_arg_euid = p->p_ucred->cr_uid; ar->k_ar.ar_arg_egid = p->p_ucred->cr_groups[0]; @@ -1811,6 +1958,10 @@ ar->k_ar.ar_valid_arg |= ARG_SOCKINFO; } +/* + * XXXAUDIT: Argument here should be 'sa' not 'so'. Caller is responsible + * for synchronizing access to the source of the address. + */ void audit_arg_sockaddr(struct thread *td, struct sockaddr *so) { @@ -1820,9 +1971,6 @@ if (ar == NULL || td == NULL || so == NULL) return; - /* - * XXX: Do we need to lock the socket? - */ bcopy(so, &ar->k_ar.ar_arg_sockaddr, sizeof(ar->k_ar.ar_arg_sockaddr)); switch (so->sa_family) { case AF_INET: @@ -1836,6 +1984,7 @@ ARG_UPATH1); ar->k_ar.ar_valid_arg |= ARG_SADDRUNIX; break; + /* XXXAUDIT: default:? */ } } @@ -1997,6 +2146,9 @@ struct socket *so; struct inpcb *pcb; + /* + * XXXAUDIT: Why is the (ar == NULL) test only in the socket case? + */ if (fp->f_type == DTYPE_VNODE) { audit_arg_vnpath((struct vnode *)fp->f_data, ARG_VNODE1); return; @@ -2006,6 +2158,10 @@ ar = currecord(); if (ar == NULL) return; + + /* + * XXXAUDIT: Socket locking? Inpcb locking? + */ so = (struct socket *)fp->f_data; if (INP_CHECK_SOCKAF(so, PF_INET)) { if (so->so_pcb == NULL) @@ -2027,6 +2183,7 @@ pcb->inp_lport; ar->k_ar.ar_valid_arg |= ARG_SOCKINFO; } + /* XXXAUDIT: else? */ } } @@ -2041,6 +2198,7 @@ KASSERT(p->p_au == NULL, ("audit_proc_alloc: p->p_au != NULL (%d)", p->p_pid)); p->p_au = malloc(sizeof(*(p->p_au)), M_AUDIT, M_WAITOK); + /* XXXAUDIT: Zero? Slab allocate? */ //printf("audit_proc_alloc: pid %d p_au %p\n", p->p_pid, p->p_au); } @@ -2089,6 +2247,10 @@ //printf("audit_proc_fork: child pid %d p_au %p\n", child->p_pid, // child->p_au); bcopy(parent->p_au, child->p_au, sizeof(*child->p_au)); + /* + * XXXAUDIT: Zero pointers to external memory, or assert they are + * zero? + */ } /* @@ -2100,6 +2262,9 @@ KASSERT(p->p_au != NULL, ("p->p_au == NULL (%d)", p->p_pid)); //printf("audit_proc_free: pid %d p_au %p\n", p->p_pid, p->p_au); + /* + * XXXAUDIT: Assert that external memory pointers are NULL? + */ free(p->p_au, M_AUDIT); p->p_au = NULL; } @@ -2109,6 +2274,8 @@ * record stored on the user thread. This function will allocate the memory to * store the path info if not already available. This memory will be * freed when the audit record is freed. + * + * XXXAUDIT: Possibly assert that the memory isn't already allocated? */ void audit_arg_upath(struct thread *td, char *upath, u_int64_t flags) @@ -2119,18 +2286,24 @@ if (td == NULL || upath == NULL) return; /* nothing to do! */ + /* + * XXXAUDIT: Witness warning for possible sleep here? + */ + + /* + * XXXAUDIT: KASSERT argument validity? + */ if ((flags & (ARG_UPATH1 | ARG_UPATH2)) == 0) return; ar = currecord(); - if (ar == NULL) /* This will be the case for unaudited system calls */ + if (ar == NULL) return; if (flags & ARG_UPATH1) { ar->k_ar.ar_valid_arg &= (ARG_ALL ^ ARG_UPATH1); pathp = &ar->k_ar.ar_arg_upath1; - } - else { + } else { ar->k_ar.ar_valid_arg &= (ARG_ALL ^ ARG_UPATH2); pathp = &ar->k_ar.ar_arg_upath2; } @@ -2158,6 +2331,8 @@ * XXX: We should accept the process argument from the caller, since * it's very likely they already have a reference. * XXX: Error handling in this function is poor. + * + * XXXAUDIT: Possibly KASSERT the path pointer is NULL? */ void audit_arg_vnpath(struct vnode *vp, u_int64_t flags) @@ -2169,9 +2344,15 @@ struct vnode_au_info *vnp; struct thread *td; + /* + * XXXAUDIT: Why is vp possibly NULL here? + */ if (vp == NULL) return; + /* + * XXXAUDIT: Less Giant needed here. + */ mtx_assert(&Giant, MA_OWNED); ASSERT_VOP_LOCKED(vp, "audit_arg_vnpath") @@ -2179,6 +2360,9 @@ if (ar == NULL) /* This will be the case for unaudited system calls */ return; + /* + * XXXAUDIT: KASSERT argument validity instead? + */ if ((flags & (ARG_VNODE1 | ARG_VNODE2)) == 0) return; @@ -2189,8 +2373,7 @@ ar->k_ar.ar_valid_arg &= (ARG_ALL ^ ARG_VNODE1); pathp = &ar->k_ar.ar_arg_kpath1; vnp = &ar->k_ar.ar_arg_vnode1; - } - else { + } else { ar->k_ar.ar_valid_arg &= (ARG_ALL ^ ARG_KPATH2); ar->k_ar.ar_valid_arg &= (ARG_ALL ^ ARG_VNODE2); pathp = &ar->k_ar.ar_arg_kpath2; From owner-p4-projects@FreeBSD.ORG Wed Jul 13 16:31:24 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEA4316A421; Wed, 13 Jul 2005 16:31:23 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8246F16A41C for ; Wed, 13 Jul 2005 16:31:23 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24E5843D49 for ; Wed, 13 Jul 2005 16:31:23 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6DGVNVu075811 for ; Wed, 13 Jul 2005 16:31:23 GMT (envelope-from soc-saturnero@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6DGVM5F075808 for perforce@freebsd.org; Wed, 13 Jul 2005 16:31:22 GMT (envelope-from soc-saturnero@freebsd.org) Date: Wed, 13 Jul 2005 16:31:22 GMT Message-Id: <200507131631.j6DGVM5F075808@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-saturnero@freebsd.org using -f From: soc-saturnero To: Perforce Change Reviews Cc: Subject: PERFORCE change 80082 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jul 2005 16:31:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=80082 Change 80082 by soc-saturnero@soc-saturnero_sberta on 2005/07/13 16:30:47 Adding kernel configuration files (and trying p4). Affected files ... .. //depot/projects/soc2005/freesbie/conf/FREESBIE.amd64#1 add .. //depot/projects/soc2005/freesbie/conf/FREESBIE.i386#1 add .. //depot/projects/soc2005/freesbie/conf/FREESBIE.powerpc#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jul 13 18:25:46 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD58A16A41F; Wed, 13 Jul 2005 18:25:45 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6017516A41C for ; Wed, 13 Jul 2005 18:25:45 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A1B343D4C for ; Wed, 13 Jul 2005 18:25:44 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6DIPi9D087446 for ; Wed, 13 Jul 2005 18:25:44 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6DIPhn9087443 for perforce@freebsd.org; Wed, 13 Jul 2005 18:25:43 GMT (envelope-from jhb@freebsd.org) Date: Wed, 13 Jul 2005 18:25:43 GMT Message-Id: <200507131825.j6DIPhn9087443@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 80088 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jul 2005 18:25:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=80088 Change 80088 by jhb@jhb_slimer on 2005/07/13 18:25:40 IFC @80086. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#41 integrate .. //depot/projects/smpng/sys/amd64/amd64/sys_machdep.c#8 integrate .. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#28 integrate .. //depot/projects/smpng/sys/amd64/isa/clock.c#15 integrate .. //depot/projects/smpng/sys/arm/arm/vm_machdep.c#14 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#23 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4.h#4 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_proto.h#9 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#24 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_syscall.h#8 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_syscallnames.c#8 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysent.c#8 integrate .. //depot/projects/smpng/sys/compat/svr4/syscalls.master#9 integrate .. //depot/projects/smpng/sys/conf/files#143 integrate .. //depot/projects/smpng/sys/conf/newvers.sh#18 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_isa.c#10 integrate .. //depot/projects/smpng/sys/dev/auxio/auxio.c#4 integrate .. //depot/projects/smpng/sys/dev/cp/if_cp.c#12 integrate .. //depot/projects/smpng/sys/dev/ctau/if_ct.c#14 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#18 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#30 integrate .. //depot/projects/smpng/sys/dev/em/README#10 integrate .. //depot/projects/smpng/sys/dev/ep/if_epvar.h#11 integrate .. //depot/projects/smpng/sys/dev/fb/creator.c#8 integrate .. //depot/projects/smpng/sys/dev/fb/machfb.c#3 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme_pci.c#19 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_amd.c#4 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_logging.c#3 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_piv.c#3 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_ppro.c#3 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#6 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/fc_log.h#4 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi.h#5 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_cnfg.h#5 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_fc.h#4 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_init.h#5 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_ioc.h#5 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_lan.h#4 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_raid.h#5 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_targ.h#4 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_type.h#6 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.c#8 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.h#5 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.h#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpt_debug.c#7 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_freebsd.c#13 delete .. //depot/projects/smpng/sys/dev/mpt/mpt_freebsd.h#7 delete .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_raid.c#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpt_raid.h#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpt_reg.h#1 branch .. //depot/projects/smpng/sys/dev/pccard/pccard.c#36 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard_cis.c#20 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard_cis.h#4 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#47 integrate .. //depot/projects/smpng/sys/dev/pccard/pccardvar.h#23 integrate .. //depot/projects/smpng/sys/dev/ral/if_ral.c#6 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn.c#21 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn_pccard.c#17 integrate .. //depot/projects/smpng/sys/dev/sn/ositech.h#1 branch .. //depot/projects/smpng/sys/dev/sound/isa/mss.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/if_ural.c#5 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#35 integrate .. //depot/projects/smpng/sys/dev/xe/if_xe.c#22 integrate .. //depot/projects/smpng/sys/dev/xe/if_xe_pccard.c#19 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#31 integrate .. //depot/projects/smpng/sys/geom/gate/g_gate.c#12 integrate .. //depot/projects/smpng/sys/geom/gate/g_gate.h#4 integrate .. //depot/projects/smpng/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/smpng/sys/i386/i386/exception.s#24 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#97 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#81 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#70 integrate .. //depot/projects/smpng/sys/i386/isa/clock.c#44 integrate .. //depot/projects/smpng/sys/i386/pci/pci_pir.c#9 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#48 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#26 integrate .. //depot/projects/smpng/sys/modules/Makefile#100 integrate .. //depot/projects/smpng/sys/modules/ed/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/ep/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/mpt/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/syscons/Makefile#4 integrate .. //depot/projects/smpng/sys/net/bpf.h#15 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto.c#7 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_crypto_ccmp.c#4 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_input.c#21 integrate .. //depot/projects/smpng/sys/pc98/cbus/clock.c#3 integrate .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#58 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#44 integrate .. //depot/projects/smpng/sys/sparc64/creator/creator.h#5 integrate .. //depot/projects/smpng/sys/sparc64/creator/creator_upa.c#9 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#50 integrate .. //depot/projects/smpng/sys/sys/param.h#83 integrate .. //depot/projects/smpng/sys/sys/pmc.h#4 integrate .. //depot/projects/smpng/sys/sys/proc.h#146 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#41 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.109 2005/04/23 02:32:30 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.110 2005/07/10 23:31:09 davidxu Exp $"); #include #include @@ -360,7 +360,7 @@ tf->tf_regs[FRAME_FLAGS] = 0; /* full restore */ } -void +int cpu_set_user_tls(struct thread *td, void *tls_base) { @@ -368,6 +368,7 @@ td->td_pcb->pcb_hw.apcb_unique = (unsigned long)tls_base; else alpha_pal_wrunique((uintptr_t)tls_base); + return (0); } /* ==== //depot/projects/smpng/sys/amd64/amd64/sys_machdep.c#8 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.89 2005/04/14 16:57:58 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/sys_machdep.c,v 1.90 2005/07/10 23:31:10 davidxu Exp $"); #include #include @@ -42,6 +42,10 @@ #include #include +#include +#include +#include + #ifndef _SYS_SYSPROTO_H_ struct sysarch_args { int op; @@ -57,6 +61,7 @@ int error = 0; struct pcb *pcb = curthread->td_pcb; uint32_t i386base; + uint64_t a64base; switch(uap->op) { case I386_GET_FSBASE: @@ -65,9 +70,12 @@ break; case I386_SET_FSBASE: error = copyin(uap->parms, &i386base, sizeof(i386base)); - pcb->pcb_fsbase = i386base; - if (!error) - wrmsr(MSR_FSBASE, pcb->pcb_fsbase); + if (!error) { + critical_enter(); + wrmsr(MSR_FSBASE, i386base); + pcb->pcb_fsbase = i386base; + critical_exit(); + } break; case I386_GET_GSBASE: i386base = pcb->pcb_gsbase; @@ -75,18 +83,29 @@ break; case I386_SET_GSBASE: error = copyin(uap->parms, &i386base, sizeof(i386base)); - pcb->pcb_gsbase = i386base; - if (!error) - wrmsr(MSR_KGSBASE, pcb->pcb_gsbase); + if (!error) { + critical_enter(); + wrmsr(MSR_KGSBASE, i386base); + pcb->pcb_gsbase = i386base; + critical_exit(); + } break; case AMD64_GET_FSBASE: error = copyout(&pcb->pcb_fsbase, uap->parms, sizeof(pcb->pcb_fsbase)); break; case AMD64_SET_FSBASE: - error = copyin(uap->parms, &pcb->pcb_fsbase, sizeof(pcb->pcb_fsbase)); - if (!error) - wrmsr(MSR_FSBASE, pcb->pcb_fsbase); + error = copyin(uap->parms, &a64base, sizeof(a64base)); + if (!error) { + if (a64base < VM_MAXUSER_ADDRESS) { + critical_enter(); + wrmsr(MSR_FSBASE, a64base); + pcb->pcb_fsbase = a64base; + critical_exit(); + } else { + error = EINVAL; + } + } break; case AMD64_GET_GSBASE: @@ -94,9 +113,17 @@ break; case AMD64_SET_GSBASE: - error = copyin(uap->parms, &pcb->pcb_gsbase, sizeof(pcb->pcb_gsbase)); - if (!error) - wrmsr(MSR_KGSBASE, pcb->pcb_gsbase); + error = copyin(uap->parms, &a64base, sizeof(a64base)); + if (!error) { + if (a64base < VM_MAXUSER_ADDRESS) { + critical_enter(); + wrmsr(MSR_KGSBASE, a64base); + pcb->pcb_gsbase = a64base; + critical_exit(); + } else { + error = EINVAL; + } + } break; default: ==== //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#28 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.247 2005/06/24 00:29:53 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.248 2005/07/10 23:31:10 davidxu Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -341,10 +341,13 @@ td->td_frame->tf_rdi = (register_t)arg; } -void +int cpu_set_user_tls(struct thread *td, void *tls_base) { + if ((u_int64_t)tls_base >= VM_MAXUSER_ADDRESS) + return (EINVAL); + if (td == curthread) { critical_enter(); td->td_pcb->pcb_fsbase = (register_t)tls_base; @@ -353,6 +356,7 @@ } else { td->td_pcb->pcb_fsbase = (register_t)tls_base; } + return (0); } #ifdef SMP ==== //depot/projects/smpng/sys/amd64/isa/clock.c#15 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.221 2005/07/05 20:13:11 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.222 2005/07/13 15:43:19 jhb Exp $"); /* * Routines to handle clock hardware. @@ -101,6 +101,7 @@ #endif u_int timer_freq = TIMER_FREQ; int timer0_max_count; +int timer0_real_max_count; int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */ struct mtx clock_lock; #define RTC_LOCK mtx_lock_spin(&clock_lock) @@ -108,7 +109,6 @@ static int beeping = 0; static const u_char daysinmonth[] = {31,28,31,30,31,30,31,31,30,31,30,31}; -static u_int hardclock_max_count; static struct intsrc *i8254_intsrc; static u_int32_t i8254_lastcount; static u_int32_t i8254_offset; @@ -517,21 +517,24 @@ static void set_timer_freq(u_int freq, int intr_freq) { - int new_timer0_max_count; + int new_timer0_real_max_count; i8254_timecounter.tc_frequency = freq; mtx_lock_spin(&clock_lock); timer_freq = freq; - new_timer0_max_count = hardclock_max_count = TIMER_DIV(intr_freq); - if (using_lapic_timer) { + if (using_lapic_timer) + new_timer0_real_max_count = 0x10000; + else + new_timer0_real_max_count = TIMER_DIV(intr_freq); + if (new_timer0_real_max_count != timer0_real_max_count) { + timer0_real_max_count = new_timer0_real_max_count; + if (timer0_real_max_count == 0x10000) + timer0_max_count = 0xffff; + else + timer0_max_count = timer0_real_max_count; outb(TIMER_MODE, TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT); - outb(TIMER_CNTR0, 0); - outb(TIMER_CNTR0, 0); - } else if (new_timer0_max_count != timer0_max_count) { - timer0_max_count = new_timer0_max_count; - outb(TIMER_MODE, TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT); - outb(TIMER_CNTR0, timer0_max_count & 0xff); - outb(TIMER_CNTR0, timer0_max_count >> 8); + outb(TIMER_CNTR0, timer0_real_max_count & 0xff); + outb(TIMER_CNTR0, timer0_real_max_count >> 8); } mtx_unlock_spin(&clock_lock); } @@ -826,19 +829,8 @@ static unsigned i8254_simple_get_timecount(struct timecounter *tc) { - u_int count; - u_int high, low; - mtx_lock_spin(&clock_lock); - - /* Select timer0 and latch counter value. */ - outb(TIMER_MODE, TIMER_SEL0 | TIMER_LATCH); - - low = inb(TIMER_CNTR0); - high = inb(TIMER_CNTR0); - count = 0xffff - ((high << 8) | low); - mtx_unlock_spin(&clock_lock); - return (count); + return (timer0_max_count - getit()); } static unsigned ==== //depot/projects/smpng/sys/arm/arm/vm_machdep.c#14 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.16 2005/06/23 11:37:41 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.17 2005/07/10 23:31:10 davidxu Exp $"); #include #include @@ -297,7 +297,7 @@ tf->tf_spsr = PSR_USR32_MODE; } -void +int cpu_set_user_tls(struct thread *td, void *tls_base) { @@ -308,6 +308,7 @@ *(void **)ARM_TP_ADDRESS = tls_base; critical_exit(); } + return (0); } void ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#23 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.38 2005/07/07 18:17:55 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.39 2005/07/13 15:12:19 jhb Exp $"); #include "opt_compat.h" @@ -397,6 +397,7 @@ start = addr; end = addr + len; + mtx_lock(&Giant); if (start != trunc_page(start)) { error = freebsd32_mmap_partial(td, start, round_page(start), prot, @@ -427,11 +428,14 @@ prot |= VM_PROT_WRITE; map = &td->td_proc->p_vmspace->vm_map; rv = vm_map_remove(map, start, end); - if (rv != KERN_SUCCESS) + if (rv != KERN_SUCCESS) { + mtx_unlock(&Giant); return (EINVAL); + } rv = vm_map_find(map, 0, 0, &start, end - start, FALSE, prot, VM_PROT_ALL, 0); + mtx_unlock(&Giant); if (rv != KERN_SUCCESS) return (EINVAL); r.fd = fd; @@ -445,6 +449,7 @@ td->td_retval[0] = addr; return (0); } + mtx_unlock(&Giant); if (end == start) { /* * After dealing with the ragged ends, there ==== //depot/projects/smpng/sys/compat/svr4/svr4.h#4 (text+ko) ==== @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/svr4/svr4.h,v 1.8 2005/01/05 22:34:36 imp Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4.h,v 1.9 2005/07/13 15:14:33 jhb Exp $ */ #include "opt_svr4.h" @@ -35,17 +35,5 @@ extern struct sysentvec svr4_sysvec; #define COMPAT_SVR4_SOLARIS2 -#define KTRACE - -/* These are currently unimplemented (see svr4_ipc.c) */ -#if defined(SYSVMSG) -# undef SYSVMSG -#endif -#if defined(SYSVSHM) -# undef SYSVSHM -#endif -#if defined(SYSVSEM) -# undef SYSVSEM -#endif #endif ==== //depot/projects/smpng/sys/compat/svr4/svr4_proto.h#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.17 2005/05/30 15:20:18 rwatson Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.17 2005/05/30 15:09:17 rwatson Exp + * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.18 2005/07/13 15:14:54 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.18 2005/07/13 15:14:33 jhb Exp */ #ifndef _SVR4_SYSPROTO_H_ @@ -100,7 +100,6 @@ char signum_l_[PADL_(int)]; int signum; char signum_r_[PADR_(int)]; char handler_l_[PADL_(svr4_sig_t)]; svr4_sig_t handler; char handler_r_[PADR_(svr4_sig_t)]; }; -#if defined(NOTYET) struct svr4_sys_msgsys_args { char what_l_[PADL_(int)]; int what; char what_r_[PADR_(int)]; char a2_l_[PADL_(int)]; int a2; char a2_r_[PADR_(int)]; @@ -108,12 +107,24 @@ char a4_l_[PADL_(int)]; int a4; char a4_r_[PADR_(int)]; char a5_l_[PADL_(int)]; int a5; char a5_r_[PADR_(int)]; }; -#else -#endif struct svr4_sys_sysarch_args { char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)]; char a1_l_[PADL_(void *)]; void * a1; char a1_r_[PADR_(void *)]; }; +struct svr4_sys_shmsys_args { + char what_l_[PADL_(int)]; int what; char what_r_[PADR_(int)]; + char a2_l_[PADL_(int)]; int a2; char a2_r_[PADR_(int)]; + char a3_l_[PADL_(int)]; int a3; char a3_r_[PADR_(int)]; + char a4_l_[PADL_(int)]; int a4; char a4_r_[PADR_(int)]; + char a5_l_[PADL_(int)]; int a5; char a5_r_[PADR_(int)]; +}; +struct svr4_sys_semsys_args { + char what_l_[PADL_(int)]; int what; char what_r_[PADR_(int)]; + char a2_l_[PADL_(int)]; int a2; char a2_r_[PADR_(int)]; + char a3_l_[PADL_(int)]; int a3; char a3_r_[PADR_(int)]; + char a4_l_[PADL_(int)]; int a4; char a4_r_[PADR_(int)]; + char a5_l_[PADL_(int)]; int a5; char a5_r_[PADR_(int)]; +}; struct svr4_sys_ioctl_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char com_l_[PADL_(u_long)]; u_long com; char com_r_[PADR_(u_long)]; @@ -413,11 +424,10 @@ int svr4_sys_pgrpsys(struct thread *, struct svr4_sys_pgrpsys_args *); int svr4_sys_times(struct thread *, struct svr4_sys_times_args *); int svr4_sys_signal(struct thread *, struct svr4_sys_signal_args *); -#if defined(NOTYET) int svr4_sys_msgsys(struct thread *, struct svr4_sys_msgsys_args *); -#else -#endif int svr4_sys_sysarch(struct thread *, struct svr4_sys_sysarch_args *); +int svr4_sys_shmsys(struct thread *, struct svr4_sys_shmsys_args *); +int svr4_sys_semsys(struct thread *, struct svr4_sys_semsys_args *); int svr4_sys_ioctl(struct thread *, struct svr4_sys_ioctl_args *); int svr4_sys_utssys(struct thread *, struct svr4_sys_utssys_args *); int svr4_sys_execve(struct thread *, struct svr4_sys_execve_args *); @@ -478,18 +488,12 @@ #ifdef COMPAT_43 -#if defined(NOTYET) -#else -#endif #endif /* COMPAT_43 */ #ifdef COMPAT_FREEBSD4 -#if defined(NOTYET) -#else -#endif #endif /* COMPAT_FREEBSD4 */ ==== //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#24 (text+ko) ==== @@ -36,10 +36,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.53 2005/03/23 08:28:06 das Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.54 2005/07/13 15:14:33 jhb Exp $"); -#define COMPAT_43 1 - +#include "opt_compat.h" +#include "opt_ktrace.h" #include "opt_mac.h" #include ==== //depot/projects/smpng/sys/compat/svr4/svr4_syscall.h#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_syscall.h,v 1.15 2005/05/30 15:20:18 rwatson Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.17 2005/05/30 15:09:17 rwatson Exp + * $FreeBSD: src/sys/compat/svr4/svr4_syscall.h,v 1.16 2005/07/13 15:14:54 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.18 2005/07/13 15:14:33 jhb Exp */ #define SVR4_SYS_exit 1 @@ -45,6 +45,8 @@ #define SVR4_SYS_svr4_sys_signal 48 #define SVR4_SYS_svr4_sys_msgsys 49 #define SVR4_SYS_svr4_sys_sysarch 50 +#define SVR4_SYS_svr4_sys_shmsys 52 +#define SVR4_SYS_svr4_sys_semsys 53 #define SVR4_SYS_svr4_sys_ioctl 54 #define SVR4_SYS_svr4_sys_utssys 57 #define SVR4_SYS_fsync 58 ==== //depot/projects/smpng/sys/compat/svr4/svr4_syscallnames.c#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_syscallnames.c,v 1.15 2005/05/30 15:20:18 rwatson Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.17 2005/05/30 15:09:17 rwatson Exp + * $FreeBSD: src/sys/compat/svr4/svr4_syscallnames.c,v 1.16 2005/07/13 15:14:54 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.18 2005/07/13 15:14:33 jhb Exp */ const char *svr4_syscallnames[] = { @@ -56,15 +56,11 @@ "setgid", /* 46 = setgid */ "getgid", /* 47 = getgid */ "svr4_sys_signal", /* 48 = svr4_sys_signal */ -#if defined(NOTYET) "svr4_sys_msgsys", /* 49 = svr4_sys_msgsys */ -#else - "#49", /* 49 = msgsys */ -#endif "svr4_sys_sysarch", /* 50 = svr4_sys_sysarch */ "#51", /* 51 = acct */ - "#52", /* 52 = shmsys */ - "#53", /* 53 = semsys */ + "svr4_sys_shmsys", /* 52 = svr4_sys_shmsys */ + "svr4_sys_semsys", /* 53 = svr4_sys_semsys */ "svr4_sys_ioctl", /* 54 = svr4_sys_ioctl */ "#55", /* 55 = uadmin */ "#56", /* 56 = exch */ ==== //depot/projects/smpng/sys/compat/svr4/svr4_sysent.c#8 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_sysent.c,v 1.16 2005/05/30 15:20:18 rwatson Exp $ - * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.17 2005/05/30 15:09:17 rwatson Exp + * $FreeBSD: src/sys/compat/svr4/svr4_sysent.c,v 1.17 2005/07/13 15:14:54 jhb Exp $ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.18 2005/07/13 15:14:33 jhb Exp */ #include @@ -69,15 +69,11 @@ { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_NULL }, /* 46 = setgid */ { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_NULL }, /* 47 = getgid */ { SYF_MPSAFE | AS(svr4_sys_signal_args), (sy_call_t *)svr4_sys_signal, AUE_NULL }, /* 48 = svr4_sys_signal */ -#if defined(NOTYET) { AS(svr4_sys_msgsys_args), (sy_call_t *)svr4_sys_msgsys, AUE_NULL }, /* 49 = svr4_sys_msgsys */ -#else - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 49 = msgsys */ -#endif { AS(svr4_sys_sysarch_args), (sy_call_t *)svr4_sys_sysarch, AUE_NULL }, /* 50 = svr4_sys_sysarch */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 51 = acct */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 52 = shmsys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 53 = semsys */ + { AS(svr4_sys_shmsys_args), (sy_call_t *)svr4_sys_shmsys, AUE_NULL }, /* 52 = svr4_sys_shmsys */ + { AS(svr4_sys_semsys_args), (sy_call_t *)svr4_sys_semsys, AUE_NULL }, /* 53 = svr4_sys_semsys */ { AS(svr4_sys_ioctl_args), (sy_call_t *)svr4_sys_ioctl, AUE_NULL }, /* 54 = svr4_sys_ioctl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 55 = uadmin */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = exch */ ==== //depot/projects/smpng/sys/compat/svr4/syscalls.master#9 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.17 2005/05/30 15:09:17 rwatson Exp $ + $FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.18 2005/07/13 15:14:33 jhb Exp $ ; from: @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; ; System call name/number master file (or rather, slave, from SVR4). @@ -96,17 +96,14 @@ 47 AUE_NULL MNOPROTO { gid_t getgid(void); } 48 AUE_NULL MSTD { int svr4_sys_signal(int signum, \ svr4_sig_t handler); } -#if defined(NOTYET) 49 AUE_NULL STD { int svr4_sys_msgsys(int what, int a2, \ - int a3, int a4, \ - int a5); } -#else -49 AUE_NULL UNIMPL msgsys -#endif + int a3, int a4, int a5); } 50 AUE_NULL STD { int svr4_sys_sysarch(int op, void *a1); } 51 AUE_NULL UNIMPL acct -52 AUE_NULL UNIMPL shmsys -53 AUE_NULL UNIMPL semsys +52 AUE_NULL STD { int svr4_sys_shmsys(int what, int a2, \ + int a3, int a4, int a5); } +53 AUE_NULL STD { int svr4_sys_semsys(int what, int a2, \ + int a3, int a4, int a5); } 54 AUE_NULL STD { int svr4_sys_ioctl(int fd, u_long com, \ caddr_t data); } 55 AUE_NULL UNIMPL uadmin ==== //depot/projects/smpng/sys/conf/files#143 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1030 2005/06/21 10:17:54 dumbbell Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1031 2005/07/10 15:07:57 scottl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -670,9 +670,10 @@ dev/mlx/mlx_pci.c optional mlx pci dev/mly/mly.c optional mly dev/mpt/mpt.c optional mpt +dev/mpt/mpt_cam.c optional mpt dev/mpt/mpt_debug.c optional mpt -dev/mpt/mpt_freebsd.c optional mpt dev/mpt/mpt_pci.c optional mpt pci +dev/mpt/mpt_raid.c optional mpt dev/my/if_my.c optional my dev/ncv/ncr53c500.c optional ncv dev/ncv/ncr53c500_pccard.c optional ncv pccard ==== //depot/projects/smpng/sys/conf/newvers.sh#18 (text+ko) ==== @@ -28,10 +28,10 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $FreeBSD: src/sys/conf/newvers.sh,v 1.69 2005/07/01 15:43:09 jhb Exp $ +# $FreeBSD: src/sys/conf/newvers.sh,v 1.70 2005/07/11 08:34:49 scottl Exp $ TYPE="FreeBSD" -REVISION="6.0" +REVISION="7.0" BRANCH="CURRENT" RELEASE="${REVISION}-${BRANCH}" VERSION="${TYPE} ${RELEASE}" ==== //depot/projects/smpng/sys/dev/advansys/adv_isa.c#10 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/advansys/adv_isa.c,v 1.28 2005/05/29 04:42:16 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/advansys/adv_isa.c,v 1.29 2005/07/13 15:44:53 jhb Exp $"); #include #include @@ -116,6 +116,12 @@ struct resource *iores, *irqres; /* + * We don't know of any PnP ID's for these cards. + */ + if (isa_get_logicalid(dev) != 0) + return (ENXIO); + + /* * Default to scanning all possible device locations. */ port_index = 0; ==== //depot/projects/smpng/sys/dev/auxio/auxio.c#4 (text+ko) ==== @@ -61,7 +61,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/auxio/auxio.c,v 1.3 2005/06/04 20:27:39 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/auxio/auxio.c,v 1.4 2005/07/10 10:33:00 marius Exp $"); #include #include @@ -95,16 +95,16 @@ #define AUXIO_PCIO_FREQ 2 #define AUXIO_PCIO_OSC 3 #define AUXIO_PCIO_TEMP 4 -#define AUXIO_PCIO_MAX 8 +#define AUXIO_PCIO_NREG 5 struct auxio_softc { struct device *sc_dev; int sc_nauxio; - struct resource *sc_res[AUXIO_PCIO_MAX]; - int sc_rid[AUXIO_PCIO_MAX]; - bus_space_tag_t sc_regt[AUXIO_PCIO_MAX]; - bus_space_handle_t sc_regh[AUXIO_PCIO_MAX]; + struct resource *sc_res[AUXIO_PCIO_NREG]; + int sc_rid[AUXIO_PCIO_NREG]; + bus_space_tag_t sc_regt[AUXIO_PCIO_NREG]; + bus_space_handle_t sc_regh[AUXIO_PCIO_NREG]; struct cdev *sc_led_dev; u_int32_t sc_led_stat; @@ -224,26 +224,13 @@ auxio_ebus_attach(device_t dev) { struct auxio_softc *sc; - u_long start, count; - int i; sc = device_get_softc(dev); bzero(sc, sizeof(*sc)); sc->sc_dev = dev; AUXIO_LOCK_INIT(sc); - for (i = 0; - i < AUXIO_PCIO_MAX && - bus_get_resource(dev, SYS_RES_MEMORY, i, &start, &count) == 0; i++) - if (bootverbose) - device_printf(sc->sc_dev, - "Got rid %d, start %#lx, count %#lx\n", - i, start, count); - if (i < 1) { - device_printf(dev, "no LED resource\n"); - return (ENXIO); - } - sc->sc_nauxio = i; + sc->sc_nauxio = AUXIO_PCIO_NREG; sc->sc_flags = AUXIO_LEDONLY | AUXIO_EBUS; return(auxio_attach_common(sc)); ==== //depot/projects/smpng/sys/dev/cp/if_cp.c#12 (text+ko) ==== @@ -22,7 +22,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cp/if_cp.c,v 1.21 2005/06/10 16:49:06 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cp/if_cp.c,v 1.24 2005/07/09 16:14:04 rik Exp $"); #include #include @@ -98,7 +98,6 @@ mtx_assert (&(_bd)->cp_mtx, MA_OWNED); \ } while (0) - static int cp_probe __P((device_t)); static int cp_attach __P((device_t)); static int cp_detach __P((device_t)); @@ -327,6 +326,8 @@ for (i = 0; i < NCHAN && b->chan[i].type; i++) { drv_t *d = b->chan[i].sys; struct mbuf *m; + if (!d || !d->running) + continue; while (_IF_QLEN(&d->queue)) { IF_DEQUEUE (&d->queue,m); if (!m) @@ -523,20 +524,20 @@ } d->ifp->if_softc = d; if_initname (d->ifp, "cp", b->num * NCHAN + c->num); - d->ifp->if_mtu = PP_MTU; + d->ifp->if_mtu = PP_MTU; d->ifp->if_flags = IFF_POINTOPOINT | IFF_MULTICAST; if (!cp_mpsafenet) d->ifp->if_flags |= IFF_NEEDSGIANT; d->ifp->if_ioctl = cp_sioctl; d->ifp->if_start = cp_ifstart; d->ifp->if_watchdog = cp_ifwatchdog; - d->ifp->if_init = cp_initialize; + d->ifp->if_init = cp_initialize; d->queue.ifq_maxlen = NRBUF; mtx_init (&d->queue.ifq_mtx, "cp_queue", NULL, MTX_DEF); sppp_attach (d->ifp); if_attach (d->ifp); - IFP2SP(d->ifp)->pp_tlf = cp_tlf; - IFP2SP(d->ifp)->pp_tls = cp_tls; + IFP2SP(d->ifp)->pp_tlf = cp_tlf; + IFP2SP(d->ifp)->pp_tls = cp_tls; /* If BPF is in the kernel, call the attach for it. * The header size of PPP or Cisco/HDLC is 4 bytes. */ bpfattach (d->ifp, DLT_PPP, 4); @@ -823,7 +824,7 @@ if (d->ifp->if_bpf) BPF_MTAP (d->ifp, m); #endif - len = m->m_pkthdr.len; + len = m_length (m, NULL); if (len >= BUFSZ) printf ("%s: too long packet: %d bytes: ", d->name, len); ==== //depot/projects/smpng/sys/dev/ctau/if_ct.c#14 (text+ko) ==== @@ -22,7 +22,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.22 2005/06/10 16:49:06 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ctau/if_ct.c,v 1.25 2005/07/09 16:14:05 rik Exp $"); #include #include @@ -287,6 +287,8 @@ for (i = 0; i < NCHAN && b->chan[i].type; i++) { drv_t *d = b->chan[i].sys; struct mbuf *m; + if (!d || !d->running) + continue; while (_IF_QLEN(&d->queue)) { IF_DEQUEUE (&d->queue,m); if (!m) @@ -741,22 +743,22 @@ ct_bus_dma_mem_free (&d->dmamem); continue; } - d->ifp->if_softc = d; + d->ifp->if_softc = d; if_initname (d->ifp, "ct", b->num * NCHAN + c->num); - d->ifp->if_mtu = PP_MTU; + d->ifp->if_mtu = PP_MTU; d->ifp->if_flags = IFF_POINTOPOINT | IFF_MULTICAST; if (!ct_mpsafenet) d->ifp->if_flags |= IFF_NEEDSGIANT; d->ifp->if_ioctl = ct_sioctl; d->ifp->if_start = ct_ifstart; d->ifp->if_watchdog = ct_ifwatchdog; - d->ifp->if_init = ct_initialize; + d->ifp->if_init = ct_initialize; d->queue.ifq_maxlen = NBUF; mtx_init (&d->queue.ifq_mtx, "ct_queue", NULL, MTX_DEF); sppp_attach (d->ifp); if_attach (d->ifp); - IFP2SP(d->ifp)->pp_tlf = ct_tlf; - IFP2SP(d->ifp)->pp_tls = ct_tls; + IFP2SP(d->ifp)->pp_tlf = ct_tlf; + IFP2SP(d->ifp)->pp_tls = ct_tls; /* If BPF is in the kernel, call the attach for it. * Header size is 4 bytes. */ bpfattach (d->ifp, DLT_PPP, 4); @@ -1031,7 +1033,7 @@ if (d->ifp->if_bpf) BPF_MTAP (d->ifp, m); #endif - len = m->m_pkthdr.len; + len = m_length (m, NULL); if (! m->m_next) ct_send_packet (d->chan, (u_char*)mtod (m, caddr_t), len, 0); ==== //depot/projects/smpng/sys/dev/cx/if_cx.c#18 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.39 2005/06/10 16:49:06 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cx/if_cx.c,v 1.45 2005/07/09 16:14:05 rik Exp $"); #include @@ -374,6 +374,8 @@ for (i = 0; i < NCHAN && b->chan[i].type; i++) { drv_t *d = b->chan[i].sys; struct mbuf *m; + if (!d || !d->running) + continue; while (_IF_QLEN(&d->queue)) { IF_DEQUEUE (&d->queue,m); if (!m) @@ -848,33 +850,35 @@ cx_bus_dma_mem_free (&d->dmamem); continue; } - d->ifp->if_softc = d; + d->ifp->if_softc = d; if_initname (d->ifp, "cx", b->num * NCHAN + c->num); - d->ifp->if_mtu = PP_MTU; - d->ifp->if_flags = IFF_POINTOPOINT | IFF_MULTICAST | - IFF_NEEDSGIANT; + d->ifp->if_mtu = PP_MTU; + d->ifp->if_flags = IFF_POINTOPOINT | IFF_MULTICAST; + if (!cx_mpsafenet) + d->ifp->if_flags |= IFF_NEEDSGIANT; d->ifp->if_ioctl = cx_sioctl; d->ifp->if_start = cx_ifstart; d->ifp->if_watchdog = cx_ifwatchdog; - d->ifp->if_init = cx_initialize; + d->ifp->if_init = cx_initialize; d->queue.ifq_maxlen = 2; mtx_init (&d->queue.ifq_mtx, "cx_queue", NULL, MTX_DEF); sppp_attach (d->ifp); if_attach (d->ifp); - IFP2SP(d->ifp)->pp_tlf = cx_tlf; - IFP2SP(d->ifp)->pp_tls = cx_tls; + IFP2SP(d->ifp)->pp_tlf = cx_tlf; + IFP2SP(d->ifp)->pp_tls = cx_tls; /* If BPF is in the kernel, call the attach for it. * Size of PPP header is 4 bytes. */ bpfattach (d->ifp, DLT_PPP, 4); #endif /*NETGRAPH*/ } d->tty = ttyalloc (); - d->tty->t_open = cx_topen; - d->tty->t_close = cx_tclose; - d->tty->t_param = cx_param; - d->tty->t_stop = cx_stop; - d->tty->t_modem = cx_tmodem; - d->tty->t_sc = d; + d->tty->t_open = cx_topen; + d->tty->t_close = cx_tclose; + d->tty->t_param = cx_param; + d->tty->t_stop = cx_stop; + d->tty->t_modem = cx_tmodem; + d->tty->t_oproc = cx_oproc; + d->tty->t_sc = d; CX_LOCK (bd); cx_start_chan (c, d->dmamem.virt, d->dmamem.phys); cx_register_receive (c, &cx_receive); @@ -1184,7 +1188,7 @@ if (d->ifp->if_bpf) BPF_MTAP (d->ifp, m); #endif - len = m->m_pkthdr.len; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 13 20:43:37 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F27516A420; Wed, 13 Jul 2005 20:43:37 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E7D2E16A41C for ; Wed, 13 Jul 2005 20:43:36 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 95D2C43D45 for ; Wed, 13 Jul 2005 20:43:36 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6DKhaD8094773 for ; Wed, 13 Jul 2005 20:43:36 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6DKhakE094769 for perforce@freebsd.org; Wed, 13 Jul 2005 20:43:36 GMT (envelope-from jhb@freebsd.org) Date: Wed, 13 Jul 2005 20:43:36 GMT Message-Id: <200507132043.j6DKhakE094769@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 80099 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jul 2005 20:43:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=80099 Change 80099 by jhb@jhb_slimer on 2005/07/13 20:43:18 IFC @80098 - loop back MP safe flag sync up. Affected files ... .. //depot/projects/smpng/sys/alpha/linux/linux_proto.h#17 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_syscall.h#15 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_sysent.c#15 integrate .. //depot/projects/smpng/sys/alpha/linux/syscalls.master#17 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_proto.h#10 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_syscall.h#9 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_sysent.c#9 integrate .. //depot/projects/smpng/sys/alpha/osf1/syscalls.master#10 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#4 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#4 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#4 integrate .. //depot/projects/smpng/sys/amd64/linux32/syscalls.master#4 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#19 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#19 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#19 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#19 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#19 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_proto.h#10 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_syscall.h#9 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_syscallnames.c#9 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysent.c#9 integrate .. //depot/projects/smpng/sys/compat/svr4/syscalls.master#10 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_isc_syscall.h#5 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_isc_sysent.c#6 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_proto.h#10 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_syscall.h#9 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysent.c#11 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix.h#7 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix_syscall.h#6 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix_sysent.c#7 integrate .. //depot/projects/smpng/sys/i386/ibcs2/syscalls.isc#5 integrate .. //depot/projects/smpng/sys/i386/ibcs2/syscalls.master#10 integrate .. //depot/projects/smpng/sys/i386/ibcs2/syscalls.xenix#5 integrate .. //depot/projects/smpng/sys/i386/linux/linux_proto.h#21 integrate .. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#20 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#21 integrate .. //depot/projects/smpng/sys/i386/linux/syscalls.master#21 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#4 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/linux/linux_proto.h#17 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.22 2005/06/08 20:47:30 sobomax Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.63 2005/06/08 20:41:27 sobomax Exp + * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.23 2005/07/13 20:35:07 jhb Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.64 2005/07/13 20:32:41 jhb Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/smpng/sys/alpha/linux/linux_syscall.h#15 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.20 2005/06/08 20:47:30 sobomax Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.63 2005/06/08 20:41:27 sobomax Exp + * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.21 2005/07/13 20:35:07 jhb Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.64 2005/07/13 20:32:41 jhb Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/smpng/sys/alpha/linux/linux_sysent.c#15 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.20 2005/06/08 20:47:30 sobomax Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.63 2005/06/08 20:41:27 sobomax Exp + * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.21 2005/07/13 20:35:07 jhb Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.64 2005/07/13 20:32:41 jhb Exp */ #include @@ -29,18 +29,18 @@ { SYF_MPSAFE | AS(close_args), (sy_call_t *)close, AUE_NULL }, /* 6 = close */ { SYF_MPSAFE | AS(osf1_wait4_args), (sy_call_t *)osf1_wait4, AUE_NULL }, /* 7 = osf1_wait4 */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 8 = */ - { AS(linux_link_args), (sy_call_t *)linux_link, AUE_NULL }, /* 9 = linux_link */ - { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_NULL }, /* 10 = linux_unlink */ + { SYF_MPSAFE | AS(linux_link_args), (sy_call_t *)linux_link, AUE_NULL }, /* 9 = linux_link */ + { SYF_MPSAFE | AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_NULL }, /* 10 = linux_unlink */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 11 = */ - { AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_NULL }, /* 12 = linux_chdir */ - { AS(fchdir_args), (sy_call_t *)fchdir, AUE_NULL }, /* 13 = fchdir */ - { AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_NULL }, /* 14 = linux_mknod */ - { AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_NULL }, /* 15 = linux_chmod */ - { AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_NULL }, /* 16 = linux_chown */ + { SYF_MPSAFE | AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_NULL }, /* 12 = linux_chdir */ + { SYF_MPSAFE | AS(fchdir_args), (sy_call_t *)fchdir, AUE_NULL }, /* 13 = fchdir */ + { SYF_MPSAFE | AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_NULL }, /* 14 = linux_mknod */ + { SYF_MPSAFE | AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_NULL }, /* 15 = linux_chmod */ + { SYF_MPSAFE | AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_NULL }, /* 16 = linux_chown */ { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 17 = linux_brk */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 18 = */ - { AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_NULL }, /* 19 = linux_lseek */ - { 0, (sy_call_t *)getpid, AUE_NULL }, /* 20 = getpid */ + { SYF_MPSAFE | AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_NULL }, /* 19 = linux_lseek */ + { SYF_MPSAFE | 0, (sy_call_t *)getpid, AUE_NULL }, /* 20 = getpid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 21 = osf1_mount */ { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_NULL }, /* 22 = linux_umount */ { SYF_MPSAFE | AS(setuid_args), (sy_call_t *)setuid, AUE_NULL }, /* 23 = setuid */ @@ -53,10 +53,10 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 30 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 31 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 32 = */ - { AS(linux_access_args), (sy_call_t *)linux_access, AUE_NULL }, /* 33 = linux_access */ + { SYF_MPSAFE | AS(linux_access_args), (sy_call_t *)linux_access, AUE_NULL }, /* 33 = linux_access */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 34 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 35 = */ - { 0, (sy_call_t *)sync, AUE_NULL }, /* 36 = sync */ + { SYF_MPSAFE | 0, (sy_call_t *)sync, AUE_NULL }, /* 36 = sync */ { SYF_MPSAFE | AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_NULL }, /* 37 = linux_kill */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 38 = */ { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_NULL }, /* 39 = setpgid */ @@ -65,112 +65,112 @@ { SYF_MPSAFE | 0, (sy_call_t *)pipe, AUE_NULL }, /* 42 = pipe */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 43 = osf_set_program_attributes */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 44 = */ - { AS(linux_open_args), (sy_call_t *)linux_open, AUE_NULL }, /* 45 = linux_open */ + { SYF_MPSAFE | AS(linux_open_args), (sy_call_t *)linux_open, AUE_NULL }, /* 45 = linux_open */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 46 = */ { SYF_MPSAFE | 0, (sy_call_t *)getgid, AUE_NULL }, /* 47 = getgid */ { SYF_MPSAFE | AS(osf1_sigprocmask_args), (sy_call_t *)osf1_sigprocmask, AUE_NULL }, /* 48 = osf1_sigprocmask */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 49 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 50 = */ - { AS(acct_args), (sy_call_t *)acct, AUE_NULL }, /* 51 = acct */ + { SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct, AUE_NULL }, /* 51 = acct */ { SYF_MPSAFE | 0, (sy_call_t *)linux_sigpending, AUE_NULL }, /* 52 = linux_sigpending */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 53 = */ { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_NULL }, /* 54 = linux_ioctl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 55 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = */ - { AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_NULL }, /* 57 = linux_symlink */ - { AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_NULL }, /* 58 = linux_readlink */ - { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_NULL }, /* 59 = linux_execve */ + { SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_NULL }, /* 57 = linux_symlink */ + { SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_NULL }, /* 58 = linux_readlink */ + { SYF_MPSAFE | AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_NULL }, /* 59 = linux_execve */ { SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask, AUE_NULL }, /* 60 = umask */ - { AS(chroot_args), (sy_call_t *)chroot, AUE_NULL }, /* 61 = chroot */ + { SYF_MPSAFE | AS(chroot_args), (sy_call_t *)chroot, AUE_NULL }, /* 61 = chroot */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 62 = */ { SYF_MPSAFE | 0, (sy_call_t *)getpgrp, AUE_NULL }, /* 63 = getpgrp */ - { 0, (sy_call_t *)linux_getpagesize, AUE_NULL }, /* 64 = linux_getpagesize */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getpagesize, AUE_NULL }, /* 64 = linux_getpagesize */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 65 = */ { SYF_MPSAFE | 0, (sy_call_t *)linux_vfork, AUE_NULL }, /* 66 = linux_vfork */ - { AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_NULL }, /* 67 = linux_newstat */ - { AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_NULL }, /* 68 = linux_newlstat */ + { SYF_MPSAFE | AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_NULL }, /* 67 = linux_newstat */ + { SYF_MPSAFE | AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_NULL }, /* 68 = linux_newlstat */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 69 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 70 = */ - { AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_NULL }, /* 71 = linux_mmap */ + { SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_NULL }, /* 71 = linux_mmap */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 72 = */ - { AS(linux_munmap_args), (sy_call_t *)linux_munmap, AUE_NULL }, /* 73 = linux_munmap */ - { AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_NULL }, /* 74 = linux_mprotect */ + { SYF_MPSAFE | AS(linux_munmap_args), (sy_call_t *)linux_munmap, AUE_NULL }, /* 73 = linux_munmap */ + { SYF_MPSAFE | AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_NULL }, /* 74 = linux_mprotect */ { SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise, AUE_NULL }, /* 75 = madvise */ - { 0, (sy_call_t *)linux_vhangup, AUE_NULL }, /* 76 = linux_vhangup */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_vhangup, AUE_NULL }, /* 76 = linux_vhangup */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 77 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 78 = */ { SYF_MPSAFE | AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_NULL }, /* 79 = linux_setgroups */ { SYF_MPSAFE | AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_NULL }, /* 80 = linux_getgroups */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 81 = */ { SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid, AUE_NULL }, /* 82 = setpgid */ - { AS(osf1_setitimer_args), (sy_call_t *)osf1_setitimer, AUE_NULL }, /* 83 = osf1_setitimer */ + { SYF_MPSAFE | AS(osf1_setitimer_args), (sy_call_t *)osf1_setitimer, AUE_NULL }, /* 83 = osf1_setitimer */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 84 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 85 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = osf_getitimer */ - { 0, (sy_call_t *)linux_gethostname, AUE_NULL }, /* 87 = linux_gethostname */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_gethostname, AUE_NULL }, /* 87 = linux_gethostname */ { SYF_MPSAFE | AS(sethostname_args), (sy_call_t *)osethostname, AUE_NULL }, /* 88 = osethostname */ - { 0, (sy_call_t *)linux_getdtablesize, AUE_NULL }, /* 89 = linux_getdtablesize */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_getdtablesize, AUE_NULL }, /* 89 = linux_getdtablesize */ { SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_NULL }, /* 90 = dup2 */ - { AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_NULL }, /* 91 = linux_newfstat */ + { SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_NULL }, /* 91 = linux_newfstat */ { SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_NULL }, /* 92 = linux_fcntl */ - { AS(osf1_select_args), (sy_call_t *)osf1_select, AUE_NULL }, /* 93 = osf1_select */ - { AS(poll_args), (sy_call_t *)poll, AUE_NULL }, /* 94 = poll */ - { AS(fsync_args), (sy_call_t *)fsync, AUE_NULL }, /* 95 = fsync */ + { SYF_MPSAFE | AS(osf1_select_args), (sy_call_t *)osf1_select, AUE_NULL }, /* 93 = osf1_select */ + { SYF_MPSAFE | AS(poll_args), (sy_call_t *)poll, AUE_NULL }, /* 94 = poll */ + { SYF_MPSAFE | AS(fsync_args), (sy_call_t *)fsync, AUE_NULL }, /* 95 = fsync */ { SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority, AUE_NULL }, /* 96 = setpriority */ - { AS(osf1_socket_args), (sy_call_t *)osf1_socket, AUE_NULL }, /* 97 = osf1_socket */ - { AS(linux_connect_args), (sy_call_t *)linux_connect, AUE_NULL }, /* 98 = linux_connect */ - { AS(accept_args), (sy_call_t *)oaccept, AUE_NULL }, /* 99 = accept */ + { SYF_MPSAFE | AS(osf1_socket_args), (sy_call_t *)osf1_socket, AUE_NULL }, /* 97 = osf1_socket */ + { SYF_MPSAFE | AS(linux_connect_args), (sy_call_t *)linux_connect, AUE_NULL }, /* 98 = linux_connect */ + { SYF_MPSAFE | AS(accept_args), (sy_call_t *)oaccept, AUE_NULL }, /* 99 = accept */ { SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_NULL }, /* 100 = linux_getpriority */ - { AS(osend_args), (sy_call_t *)osend, AUE_NULL }, /* 101 = osend */ - { AS(orecv_args), (sy_call_t *)orecv, AUE_NULL }, /* 102 = orecv */ + { SYF_MPSAFE | AS(osend_args), (sy_call_t *)osend, AUE_NULL }, /* 101 = osend */ + { SYF_MPSAFE | AS(orecv_args), (sy_call_t *)orecv, AUE_NULL }, /* 102 = orecv */ { SYF_MPSAFE | AS(osf1_sigreturn_args), (sy_call_t *)osf1_sigreturn, AUE_NULL }, /* 103 = osf1_sigreturn */ - { AS(bind_args), (sy_call_t *)bind, AUE_NULL }, /* 104 = bind */ - { AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_NULL }, /* 105 = setsockopt */ - { AS(listen_args), (sy_call_t *)listen, AUE_NULL }, /* 106 = listen */ + { SYF_MPSAFE | AS(bind_args), (sy_call_t *)bind, AUE_NULL }, /* 104 = bind */ + { SYF_MPSAFE | AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_NULL }, /* 105 = setsockopt */ + { SYF_MPSAFE | AS(listen_args), (sy_call_t *)listen, AUE_NULL }, /* 106 = listen */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 107 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 108 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 109 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 110 = */ { SYF_MPSAFE | AS(osf1_sigsuspend_args), (sy_call_t *)osf1_sigsuspend, AUE_NULL }, /* 111 = osf1_sigsuspend */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 112 = osf_sigstack */ - { 0, (sy_call_t *)linux_recvmsg, AUE_NULL }, /* 113 = linux_recvmsg */ - { 0, (sy_call_t *)linux_sendmsg, AUE_NULL }, /* 114 = linux_sendmsg */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_recvmsg, AUE_NULL }, /* 113 = linux_recvmsg */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_sendmsg, AUE_NULL }, /* 114 = linux_sendmsg */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 115 = */ { SYF_MPSAFE | AS(osf1_gettimeofday_args), (sy_call_t *)osf1_gettimeofday, AUE_NULL }, /* 116 = osf1_gettimeofday */ - { AS(osf1_getrusage_args), (sy_call_t *)osf1_getrusage, AUE_NULL }, /* 117 = osf1_getrusage */ - { AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_NULL }, /* 118 = getsockopt */ + { SYF_MPSAFE | AS(osf1_getrusage_args), (sy_call_t *)osf1_getrusage, AUE_NULL }, /* 117 = osf1_getrusage */ + { SYF_MPSAFE | AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_NULL }, /* 118 = getsockopt */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 119 = */ - { AS(readv_args), (sy_call_t *)readv, AUE_NULL }, /* 120 = readv */ - { AS(writev_args), (sy_call_t *)writev, AUE_NULL }, /* 121 = writev */ + { SYF_MPSAFE | AS(readv_args), (sy_call_t *)readv, AUE_NULL }, /* 120 = readv */ + { SYF_MPSAFE | AS(writev_args), (sy_call_t *)writev, AUE_NULL }, /* 121 = writev */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 122 = osf_settimeofday */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 123 = fchown */ - { AS(fchmod_args), (sy_call_t *)fchmod, AUE_NULL }, /* 124 = fchmod */ - { AS(recvfrom_args), (sy_call_t *)orecvfrom, AUE_NULL }, /* 125 = recvfrom */ + { SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 123 = fchown */ + { SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_NULL }, /* 124 = fchmod */ + { SYF_MPSAFE | AS(recvfrom_args), (sy_call_t *)orecvfrom, AUE_NULL }, /* 125 = recvfrom */ { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid, AUE_NULL }, /* 126 = setreuid */ { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_NULL }, /* 127 = setregid */ - { AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_NULL }, /* 128 = linux_rename */ - { AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_NULL }, /* 129 = linux_truncate */ - { AS(oftruncate_args), (sy_call_t *)oftruncate, AUE_NULL }, /* 130 = oftruncate */ - { AS(flock_args), (sy_call_t *)flock, AUE_NULL }, /* 131 = flock */ + { SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_NULL }, /* 128 = linux_rename */ + { SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_NULL }, /* 129 = linux_truncate */ + { SYF_MPSAFE | AS(oftruncate_args), (sy_call_t *)oftruncate, AUE_NULL }, /* 130 = oftruncate */ + { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_NULL }, /* 131 = flock */ { SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_NULL }, /* 132 = setgid */ - { AS(osf1_sendto_args), (sy_call_t *)osf1_sendto, AUE_NULL }, /* 133 = osf1_sendto */ - { AS(shutdown_args), (sy_call_t *)shutdown, AUE_NULL }, /* 134 = shutdown */ - { 0, (sy_call_t *)linux_socketpair, AUE_NULL }, /* 135 = linux_socketpair */ - { AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_NULL }, /* 136 = linux_mkdir */ - { AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_NULL }, /* 137 = linux_rmdir */ - { AS(utimes_args), (sy_call_t *)utimes, AUE_NULL }, /* 138 = utimes */ + { SYF_MPSAFE | AS(osf1_sendto_args), (sy_call_t *)osf1_sendto, AUE_NULL }, /* 133 = osf1_sendto */ + { SYF_MPSAFE | AS(shutdown_args), (sy_call_t *)shutdown, AUE_NULL }, /* 134 = shutdown */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_socketpair, AUE_NULL }, /* 135 = linux_socketpair */ + { SYF_MPSAFE | AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_NULL }, /* 136 = linux_mkdir */ + { SYF_MPSAFE | AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_NULL }, /* 137 = linux_rmdir */ + { SYF_MPSAFE | AS(utimes_args), (sy_call_t *)utimes, AUE_NULL }, /* 138 = utimes */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 139 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 140 = */ - { AS(ogetpeername_args), (sy_call_t *)ogetpeername, AUE_NULL }, /* 141 = ogetpeername */ + { SYF_MPSAFE | AS(ogetpeername_args), (sy_call_t *)ogetpeername, AUE_NULL }, /* 141 = ogetpeername */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 142 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 143 = */ { SYF_MPSAFE | AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_NULL }, /* 144 = linux_getrlimit */ { SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_NULL }, /* 145 = linux_setrlimit */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 146 = */ { SYF_MPSAFE | 0, (sy_call_t *)setsid, AUE_NULL }, /* 147 = setsid */ - { 0, (sy_call_t *)linux_quotactl, AUE_NULL }, /* 148 = linux_quotactl */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_quotactl, AUE_NULL }, /* 148 = linux_quotactl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 149 = */ - { AS(getsockname_args), (sy_call_t *)ogetsockname, AUE_NULL }, /* 150 = getsockname */ + { SYF_MPSAFE | AS(getsockname_args), (sy_call_t *)ogetsockname, AUE_NULL }, /* 150 = getsockname */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 151 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 152 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 153 = */ @@ -220,24 +220,24 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 197 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 198 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 199 = osf_swapon */ - { AS(linux_msgctl_args), (sy_call_t *)linux_msgctl, AUE_NULL }, /* 200 = linux_msgctl */ - { AS(linux_msgget_args), (sy_call_t *)linux_msgget, AUE_NULL }, /* 201 = linux_msgget */ - { AS(linux_msgrcv_args), (sy_call_t *)linux_msgrcv, AUE_NULL }, /* 202 = linux_msgrcv */ - { AS(linux_msgsnd_args), (sy_call_t *)linux_msgsnd, AUE_NULL }, /* 203 = linux_msgsnd */ + { SYF_MPSAFE | AS(linux_msgctl_args), (sy_call_t *)linux_msgctl, AUE_NULL }, /* 200 = linux_msgctl */ + { SYF_MPSAFE | AS(linux_msgget_args), (sy_call_t *)linux_msgget, AUE_NULL }, /* 201 = linux_msgget */ + { SYF_MPSAFE | AS(linux_msgrcv_args), (sy_call_t *)linux_msgrcv, AUE_NULL }, /* 202 = linux_msgrcv */ + { SYF_MPSAFE | AS(linux_msgsnd_args), (sy_call_t *)linux_msgsnd, AUE_NULL }, /* 203 = linux_msgsnd */ { AS(linux_semctl_args), (sy_call_t *)linux_semctl, AUE_NULL }, /* 204 = linux_semctl */ - { AS(linux_semget_args), (sy_call_t *)linux_semget, AUE_NULL }, /* 205 = linux_semget */ - { AS(linux_semop_args), (sy_call_t *)linux_semop, AUE_NULL }, /* 206 = linux_semop */ + { SYF_MPSAFE | AS(linux_semget_args), (sy_call_t *)linux_semget, AUE_NULL }, /* 205 = linux_semget */ + { SYF_MPSAFE | AS(linux_semop_args), (sy_call_t *)linux_semop, AUE_NULL }, /* 206 = linux_semop */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 207 = osf_utsname */ - { AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_NULL }, /* 208 = linux_lchown */ - { AS(linux_shmat_args), (sy_call_t *)linux_shmat, AUE_NULL }, /* 209 = linux_shmat */ - { AS(linux_shmctl_args), (sy_call_t *)linux_shmctl, AUE_NULL }, /* 210 = linux_shmctl */ - { AS(linux_shmdt_args), (sy_call_t *)linux_shmdt, AUE_NULL }, /* 211 = linux_shmdt */ - { AS(linux_shmget_args), (sy_call_t *)linux_shmget, AUE_NULL }, /* 212 = linux_shmget */ + { SYF_MPSAFE | AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_NULL }, /* 208 = linux_lchown */ + { SYF_MPSAFE | AS(linux_shmat_args), (sy_call_t *)linux_shmat, AUE_NULL }, /* 209 = linux_shmat */ + { SYF_MPSAFE | AS(linux_shmctl_args), (sy_call_t *)linux_shmctl, AUE_NULL }, /* 210 = linux_shmctl */ + { SYF_MPSAFE | AS(linux_shmdt_args), (sy_call_t *)linux_shmdt, AUE_NULL }, /* 211 = linux_shmdt */ + { SYF_MPSAFE | AS(linux_shmget_args), (sy_call_t *)linux_shmget, AUE_NULL }, /* 212 = linux_shmget */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 213 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 214 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 215 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 216 = */ - { AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_NULL }, /* 217 = linux_msync */ + { SYF_MPSAFE | AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_NULL }, /* 217 = linux_msync */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 218 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 219 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 220 = */ @@ -255,7 +255,7 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 232 = */ { SYF_MPSAFE | AS(getpgid_args), (sy_call_t *)getpgid, AUE_NULL }, /* 233 = getpgid */ { SYF_MPSAFE | AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_NULL }, /* 234 = linux_getsid */ - { 0, (sy_call_t *)linux_sigaltstack, AUE_NULL }, /* 235 = linux_sigaltstack */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_sigaltstack, AUE_NULL }, /* 235 = linux_sigaltstack */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 236 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 237 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 238 = */ @@ -274,10 +274,10 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 251 = osf_usleep_thread */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 252 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 253 = */ - { AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL }, /* 254 = linux_sysfs */ + { SYF_MPSAFE | AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL }, /* 254 = linux_sysfs */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 255 = */ - { AS(osf1_getsysinfo_args), (sy_call_t *)osf1_getsysinfo, AUE_NULL }, /* 256 = osf1_getsysinfo */ - { AS(osf1_setsysinfo_args), (sy_call_t *)osf1_setsysinfo, AUE_NULL }, /* 257 = osf1_setsysinfo */ + { SYF_MPSAFE | AS(osf1_getsysinfo_args), (sy_call_t *)osf1_getsysinfo, AUE_NULL }, /* 256 = osf1_getsysinfo */ + { SYF_MPSAFE | AS(osf1_setsysinfo_args), (sy_call_t *)osf1_setsysinfo, AUE_NULL }, /* 257 = osf1_setsysinfo */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 258 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 259 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 260 = */ @@ -320,36 +320,36 @@ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 297 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 298 = */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 299 = */ - { 0, (sy_call_t *)linux_bdflush, AUE_NULL }, /* 300 = linux_bdflush */ - { 0, (sy_call_t *)linux_sethae, AUE_NULL }, /* 301 = linux_sethae */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_bdflush, AUE_NULL }, /* 300 = linux_bdflush */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_sethae, AUE_NULL }, /* 301 = linux_sethae */ { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_NULL }, /* 302 = linux_mount */ - { 0, (sy_call_t *)linux_old_adjtimex, AUE_NULL }, /* 303 = linux_old_adjtimex */ - { 0, (sy_call_t *)linux_swapoff, AUE_NULL }, /* 304 = linux_swapoff */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_old_adjtimex, AUE_NULL }, /* 303 = linux_old_adjtimex */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_swapoff, AUE_NULL }, /* 304 = linux_swapoff */ { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_NULL }, /* 305 = linux_getdents */ - { 0, (sy_call_t *)linux_create_module, AUE_NULL }, /* 306 = linux_create_module */ - { 0, (sy_call_t *)linux_init_module, AUE_NULL }, /* 307 = linux_init_module */ - { 0, (sy_call_t *)linux_delete_module, AUE_NULL }, /* 308 = linux_delete_module */ - { 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL }, /* 309 = linux_get_kernel_syms */ - { AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL }, /* 310 = linux_syslog */ - { AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_NULL }, /* 311 = linux_reboot */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_create_module, AUE_NULL }, /* 306 = linux_create_module */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_init_module, AUE_NULL }, /* 307 = linux_init_module */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_delete_module, AUE_NULL }, /* 308 = linux_delete_module */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL }, /* 309 = linux_get_kernel_syms */ + { SYF_MPSAFE | AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL }, /* 310 = linux_syslog */ + { SYF_MPSAFE | AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_NULL }, /* 311 = linux_reboot */ { SYF_MPSAFE | AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_NULL }, /* 312 = linux_clone */ { AS(linux_uselib_args), (sy_call_t *)linux_uselib, AUE_NULL }, /* 313 = linux_uselib */ { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock, AUE_NULL }, /* 314 = mlock */ { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock, AUE_NULL }, /* 315 = munlock */ { SYF_MPSAFE | AS(mlockall_args), (sy_call_t *)mlockall, AUE_NULL }, /* 316 = mlockall */ { SYF_MPSAFE | 0, (sy_call_t *)munlockall, AUE_NULL }, /* 317 = munlockall */ - { 0, (sy_call_t *)linux_sysinfo, AUE_NULL }, /* 318 = linux_sysinfo */ - { AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_NULL }, /* 319 = linux_sysctl */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_sysinfo, AUE_NULL }, /* 318 = linux_sysinfo */ + { SYF_MPSAFE | AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_NULL }, /* 319 = linux_sysctl */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 320 = sys_idle */ { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_NULL }, /* 321 = linux_oldumount */ - { AS(swapon_args), (sy_call_t *)swapon, AUE_NULL }, /* 322 = swapon */ - { AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 323 = linux_times */ - { AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_NULL }, /* 324 = linux_personality */ - { AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_NULL }, /* 325 = linux_setfsuid */ - { AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_NULL }, /* 326 = linux_setfsgid */ - { AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL }, /* 327 = linux_ustat */ - { AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_NULL }, /* 328 = linux_statfs */ - { AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_NULL }, /* 329 = linux_fstatfs */ + { SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_NULL }, /* 322 = swapon */ + { SYF_MPSAFE | AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 323 = linux_times */ + { SYF_MPSAFE | AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_NULL }, /* 324 = linux_personality */ + { SYF_MPSAFE | AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_NULL }, /* 325 = linux_setfsuid */ + { SYF_MPSAFE | AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_NULL }, /* 326 = linux_setfsgid */ + { SYF_MPSAFE | AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL }, /* 327 = linux_ustat */ + { SYF_MPSAFE | AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_NULL }, /* 328 = linux_statfs */ + { SYF_MPSAFE | AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_NULL }, /* 329 = linux_fstatfs */ { SYF_MPSAFE | AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL }, /* 330 = sched_setparam */ { SYF_MPSAFE | AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL }, /* 331 = sched_getparam */ { SYF_MPSAFE | AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_NULL }, /* 332 = linux_sched_setscheduler */ @@ -357,45 +357,45 @@ { SYF_MPSAFE | 0, (sy_call_t *)sched_yield, AUE_NULL }, /* 334 = sched_yield */ { SYF_MPSAFE | AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_NULL }, /* 335 = linux_sched_get_priority_max */ { SYF_MPSAFE | AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_NULL }, /* 336 = linux_sched_get_priority_min */ - { AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_NULL }, /* 337 = sched_rr_get_interval */ + { SYF_MPSAFE | AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_NULL }, /* 337 = sched_rr_get_interval */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 338 = sys_afs_syscall */ - { AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL }, /* 339 = linux_newuname */ + { SYF_MPSAFE | AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL }, /* 339 = linux_newuname */ { SYF_MPSAFE | AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL }, /* 340 = nanosleep */ - { AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL }, /* 341 = linux_mremap */ - { 0, (sy_call_t *)linux_nfsservctl, AUE_NULL }, /* 342 = linux_nfsservctl */ + { SYF_MPSAFE | AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL }, /* 341 = linux_mremap */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_nfsservctl, AUE_NULL }, /* 342 = linux_nfsservctl */ { SYF_MPSAFE | AS(setresuid_args), (sy_call_t *)setresuid, AUE_NULL }, /* 343 = setresuid */ { SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid, AUE_NULL }, /* 344 = getresuid */ - { 0, (sy_call_t *)linux_pciconfig_read, AUE_NULL }, /* 345 = linux_pciconfig_read */ - { 0, (sy_call_t *)linux_pciconfig_write, AUE_NULL }, /* 346 = linux_pciconfig_write */ - { 0, (sy_call_t *)linux_query_module, AUE_NULL }, /* 347 = linux_query_module */ - { 0, (sy_call_t *)linux_prctl, AUE_NULL }, /* 348 = linux_prctl */ - { AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_NULL }, /* 349 = linux_pread */ - { AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_NULL }, /* 350 = linux_pwrite */ - { 0, (sy_call_t *)linux_rt_sigreturn, AUE_NULL }, /* 351 = linux_rt_sigreturn */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_pciconfig_read, AUE_NULL }, /* 345 = linux_pciconfig_read */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_pciconfig_write, AUE_NULL }, /* 346 = linux_pciconfig_write */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_query_module, AUE_NULL }, /* 347 = linux_query_module */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_prctl, AUE_NULL }, /* 348 = linux_prctl */ + { SYF_MPSAFE | AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_NULL }, /* 349 = linux_pread */ + { SYF_MPSAFE | AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_NULL }, /* 350 = linux_pwrite */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigreturn, AUE_NULL }, /* 351 = linux_rt_sigreturn */ { SYF_MPSAFE | AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL }, /* 352 = linux_rt_sigaction */ { SYF_MPSAFE | AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL }, /* 353 = linux_rt_sigprocmask */ - { 0, (sy_call_t *)linux_rt_sigpending, AUE_NULL }, /* 354 = linux_rt_sigpending */ - { 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL }, /* 355 = linux_rt_sigtimedwait */ - { 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL }, /* 356 = linux_rt_sigqueueinfo */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigpending, AUE_NULL }, /* 354 = linux_rt_sigpending */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL }, /* 355 = linux_rt_sigtimedwait */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL }, /* 356 = linux_rt_sigqueueinfo */ { SYF_MPSAFE | AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL }, /* 357 = linux_rt_sigsuspend */ - { AS(linux_select_args), (sy_call_t *)linux_select, AUE_NULL }, /* 358 = linux_select */ + { SYF_MPSAFE | AS(linux_select_args), (sy_call_t *)linux_select, AUE_NULL }, /* 358 = linux_select */ { SYF_MPSAFE | AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_NULL }, /* 359 = gettimeofday */ { SYF_MPSAFE | AS(settimeofday_args), (sy_call_t *)settimeofday, AUE_NULL }, /* 360 = settimeofday */ { SYF_MPSAFE | AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_NULL }, /* 361 = linux_getitimer */ { SYF_MPSAFE | AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_NULL }, /* 362 = linux_setitimer */ - { AS(linux_utimes_args), (sy_call_t *)linux_utimes, AUE_NULL }, /* 363 = linux_utimes */ + { SYF_MPSAFE | AS(linux_utimes_args), (sy_call_t *)linux_utimes, AUE_NULL }, /* 363 = linux_utimes */ { SYF_MPSAFE | AS(getrusage_args), (sy_call_t *)getrusage, AUE_NULL }, /* 364 = getrusage */ { SYF_MPSAFE | AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_NULL }, /* 365 = linux_wait4 */ - { 0, (sy_call_t *)linux_adjtimex, AUE_NULL }, /* 366 = linux_adjtimex */ - { AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_NULL }, /* 367 = linux_getcwd */ - { 0, (sy_call_t *)linux_capget, AUE_NULL }, /* 368 = linux_capget */ - { 0, (sy_call_t *)linux_capset, AUE_NULL }, /* 369 = linux_capset */ - { 0, (sy_call_t *)linux_sendfile, AUE_NULL }, /* 370 = linux_sendfile */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_adjtimex, AUE_NULL }, /* 366 = linux_adjtimex */ + { SYF_MPSAFE | AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_NULL }, /* 367 = linux_getcwd */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_capget, AUE_NULL }, /* 368 = linux_capget */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_capset, AUE_NULL }, /* 369 = linux_capset */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_sendfile, AUE_NULL }, /* 370 = linux_sendfile */ { SYF_MPSAFE | AS(setresgid_args), (sy_call_t *)setresgid, AUE_NULL }, /* 371 = setresgid */ { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid, AUE_NULL }, /* 372 = getresgid */ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 373 = sys_dipc */ - { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_NULL }, /* 374 = linux_pivot_root */ - { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_NULL }, /* 375 = linux_mincore */ - { 0, (sy_call_t *)linux_pciconfig_iobase, AUE_NULL }, /* 376 = linux_pciconfig_iobase */ + { SYF_MPSAFE | AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_NULL }, /* 374 = linux_pivot_root */ + { SYF_MPSAFE | AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_NULL }, /* 375 = linux_mincore */ + { SYF_MPSAFE | 0, (sy_call_t *)linux_pciconfig_iobase, AUE_NULL }, /* 376 = linux_pciconfig_iobase */ { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_NULL }, /* 377 = linux_getdents64 */ }; ==== //depot/projects/smpng/sys/alpha/linux/syscalls.master#17 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.63 2005/06/08 20:41:27 sobomax Exp $ + $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.64 2005/07/13 20:32:41 jhb Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -59,22 +59,22 @@ int options, \ struct osf1_rusage *rusage); } 8 AUE_NULL UNIMPL -9 AUE_NULL STD { int linux_link(char *path, char *to); } -10 AUE_NULL STD { int linux_unlink(char *path); } +9 AUE_NULL MSTD { int linux_link(char *path, char *to); } +10 AUE_NULL MSTD { int linux_unlink(char *path); } 11 AUE_NULL UNIMPL -12 AUE_NULL STD { int linux_chdir(char *path); } -13 AUE_NULL NOPROTO { int fchdir(int fd); } -14 AUE_NULL STD { int linux_mknod(char *path, l_int mode, \ +12 AUE_NULL MSTD { int linux_chdir(char *path); } +13 AUE_NULL MNOPROTO { int fchdir(int fd); } +14 AUE_NULL MSTD { int linux_mknod(char *path, l_int mode, \ l_dev_t dev); } -15 AUE_NULL STD { int linux_chmod(char *path, \ +15 AUE_NULL MSTD { int linux_chmod(char *path, \ l_mode_t mode); } -16 AUE_NULL STD { int linux_chown(char *path, l_uid_t uid, \ +16 AUE_NULL MSTD { int linux_chown(char *path, l_uid_t uid, \ l_gid_t gid); } 17 AUE_NULL STD { int linux_brk(l_ulong dsend); } 18 AUE_NULL UNIMPL -19 AUE_NULL STD { int linux_lseek(l_uint fdes, l_off_t off, \ +19 AUE_NULL MSTD { int linux_lseek(l_uint fdes, l_off_t off, \ l_int whence); } -20 AUE_NULL NOPROTO { int getpid(void); } +20 AUE_NULL MNOPROTO { int getpid(void); } 21 AUE_NULL UNIMPL osf1_mount 22 AUE_NULL STD { int linux_umount(char *path, l_int flags); } 23 AUE_NULL MNOPROTO { int setuid(uid_t uid); } @@ -87,10 +87,10 @@ 30 AUE_NULL UNIMPL 31 AUE_NULL UNIMPL 32 AUE_NULL UNIMPL -33 AUE_NULL STD { int linux_access(char *path, l_int flags); } +33 AUE_NULL MSTD { int linux_access(char *path, l_int flags); } 34 AUE_NULL UNIMPL 35 AUE_NULL UNIMPL -36 AUE_NULL NOPROTO { int sync(void); } +36 AUE_NULL MNOPROTO { int sync(void); } 37 AUE_NULL MSTD { int linux_kill(l_int pid, l_int signum); } 38 AUE_NULL UNIMPL 39 AUE_NULL MNOPROTO { int setpgid(int pid, int pgid); } @@ -99,7 +99,7 @@ 42 AUE_NULL MNOPROTO { int pipe(void); } 43 AUE_NULL UNIMPL osf_set_program_attributes 44 AUE_NULL UNIMPL -45 AUE_NULL STD { int linux_open(char *path, l_int flags, \ +45 AUE_NULL MSTD { int linux_open(char *path, l_int flags, \ l_int mode); } 46 AUE_NULL UNIMPL 47 AUE_NULL MNOPROTO { int getgid(void); } @@ -107,42 +107,42 @@ u_long mask); } 49 AUE_NULL UNIMPL 50 AUE_NULL UNIMPL -51 AUE_NULL NOPROTO { int acct(char *path); } +51 AUE_NULL MNOPROTO { int acct(char *path); } 52 AUE_NULL MSTD { int linux_sigpending(void); } 53 AUE_NULL UNIMPL 54 AUE_NULL STD { int linux_ioctl(l_uint fd, l_uint cmd, \ l_ulong arg); } 55 AUE_NULL UNIMPL 56 AUE_NULL UNIMPL -57 AUE_NULL STD { int linux_symlink(char *path, char *to); } -58 AUE_NULL STD { int linux_readlink(char *name, char *buf, \ +57 AUE_NULL MSTD { int linux_symlink(char *path, char *to); } +58 AUE_NULL MSTD { int linux_readlink(char *name, char *buf, \ l_int count); } -59 AUE_NULL STD { int linux_execve(char *path, char **argp, \ +59 AUE_NULL MSTD { int linux_execve(char *path, char **argp, \ char **envp); } 60 AUE_NULL MNOPROTO { int umask(int newmask); } -61 AUE_NULL NOPROTO { int chroot(char *path); } +61 AUE_NULL MNOPROTO { int chroot(char *path); } 62 AUE_NULL UNIMPL 63 AUE_NULL MNOPROTO { int getpgrp(void); } -64 AUE_NULL STD { int linux_getpagesize(void); } +64 AUE_NULL MSTD { int linux_getpagesize(void); } 65 AUE_NULL UNIMPL 66 AUE_NULL MSTD { int linux_vfork(void); } -67 AUE_NULL STD { int linux_newstat(char *path, \ +67 AUE_NULL MSTD { int linux_newstat(char *path, \ struct l_newstat *buf); } -68 AUE_NULL STD { int linux_newlstat(char *path, \ +68 AUE_NULL MSTD { int linux_newlstat(char *path, \ struct l_newstat *buf); } 69 AUE_NULL UNIMPL 70 AUE_NULL UNIMPL -71 AUE_NULL STD { int linux_mmap(l_ulong addr, l_ulong len, \ +71 AUE_NULL MSTD { int linux_mmap(l_ulong addr, l_ulong len, \ l_ulong prot, l_ulong flags, l_ulong fd, \ l_ulong pos); } 72 AUE_NULL UNIMPL -73 AUE_NULL STD { int linux_munmap(l_ulong addr, \ +73 AUE_NULL MSTD { int linux_munmap(l_ulong addr, \ l_size_t len); } -74 AUE_NULL STD { int linux_mprotect(l_ulong addr, \ +74 AUE_NULL MSTD { int linux_mprotect(l_ulong addr, \ l_size_t len, l_ulong prot); } 75 AUE_NULL MNOPROTO { int madvise(void *addr, \ size_t len, int behav); } -76 AUE_NULL STD { int linux_vhangup(void); } +76 AUE_NULL MSTD { int linux_vhangup(void); } 77 AUE_NULL UNIMPL 78 AUE_NULL UNIMPL 79 AUE_NULL MSTD { int linux_setgroups(l_int gidsetsize, \ @@ -151,95 +151,95 @@ l_gid_t *grouplist); } 81 AUE_NULL UNIMPL 82 AUE_NULL MNODEF setpgid setpgid setpgid_args int -83 AUE_NULL STD { int osf1_setitimer(u_int which, \ +83 AUE_NULL MSTD { int osf1_setitimer(u_int which, \ struct itimerval *itv, \ struct itimerval *oitv); } 84 AUE_NULL UNIMPL 85 AUE_NULL UNIMPL 86 AUE_NULL UNIMPL osf_getitimer -87 AUE_NULL STD { int linux_gethostname(void); } +87 AUE_NULL MSTD { int linux_gethostname(void); } 88 AUE_NULL MNOPROTO { int osethostname(char *hostname, \ u_int len); } osethostname \ sethostname_args int -89 AUE_NULL STD { int linux_getdtablesize(void); } +89 AUE_NULL MSTD { int linux_getdtablesize(void); } 90 AUE_NULL MNOPROTO { int dup2(u_int from, u_int to); } -91 AUE_NULL STD { int linux_newfstat(l_uint fd, \ +91 AUE_NULL MSTD { int linux_newfstat(l_uint fd, \ struct l_newstat *buf); } 92 AUE_NULL MSTD { int linux_fcntl(l_uint fd, l_uint cmd, \ l_ulong arg); } -93 AUE_NULL STD { int osf1_select(u_int nd, fd_set *in, \ +93 AUE_NULL MSTD { int osf1_select(u_int nd, fd_set *in, \ fd_set *ou, fd_set *ex, \ struct timeval *tv); } -94 AUE_NULL NOPROTO { int poll(struct pollfd*, unsigned int \ +94 AUE_NULL MNOPROTO { int poll(struct pollfd*, unsigned int \ nfds, long timeout); } -95 AUE_NULL NOPROTO { int fsync(int fd); } +95 AUE_NULL MNOPROTO { int fsync(int fd); } 96 AUE_NULL MNOPROTO { int setpriority(int which, \ int who, int prio); } -97 AUE_NULL STD { int osf1_socket(int domain, int type, \ +97 AUE_NULL MSTD { int osf1_socket(int domain, int type, \ int protocol); } -98 AUE_NULL STD { int linux_connect(l_int s, \ +98 AUE_NULL MSTD { int linux_connect(l_int s, \ struct l_sockaddr *name, l_int namelen); } -99 AUE_NULL NOPROTO { int oaccept(int s, caddr_t name, \ +99 AUE_NULL MNOPROTO { int oaccept(int s, caddr_t name, \ int *anamelen); } accept accept_args int 100 AUE_NULL MSTD { int linux_getpriority(int which, int who); } -101 AUE_NULL NOPROTO { int osend(int s, caddr_t buf, int len, \ +101 AUE_NULL MNOPROTO { int osend(int s, caddr_t buf, int len, \ int flags); } -102 AUE_NULL NOPROTO { int orecv(int s, caddr_t buf, int len, \ +102 AUE_NULL MNOPROTO { int orecv(int s, caddr_t buf, int len, \ int flags); } 103 AUE_NULL MSTD { int osf1_sigreturn( \ struct osigcontext *sigcntxp); } -104 AUE_NULL NOPROTO { int bind(int s, caddr_t name, \ +104 AUE_NULL MNOPROTO { int bind(int s, caddr_t name, \ int namelen); } -105 AUE_NULL NOPROTO { int setsockopt(int s, int level, int name, \ +105 AUE_NULL MNOPROTO { int setsockopt(int s, int level, int name, \ caddr_t val, int valsize); } -106 AUE_NULL NOPROTO { int listen(int s, int backlog); } +106 AUE_NULL MNOPROTO { int listen(int s, int backlog); } 107 AUE_NULL UNIMPL 108 AUE_NULL UNIMPL 109 AUE_NULL UNIMPL 110 AUE_NULL UNIMPL 111 AUE_NULL MSTD { int osf1_sigsuspend(unsigned long ss); } 112 AUE_NULL UNIMPL osf_sigstack -113 AUE_NULL STD { int linux_recvmsg(void); } -114 AUE_NULL STD { int linux_sendmsg(void); } +113 AUE_NULL MSTD { int linux_recvmsg(void); } +114 AUE_NULL MSTD { int linux_sendmsg(void); } 115 AUE_NULL UNIMPL 116 AUE_NULL MSTD { int osf1_gettimeofday(struct timeval *tp, \ struct timezone *tzp); } -117 AUE_NULL STD { int osf1_getrusage(long who, \ +117 AUE_NULL MSTD { int osf1_getrusage(long who, \ void *rusage); } -118 AUE_NULL NOPROTO { int getsockopt(int s, int level, int name, \ +118 AUE_NULL MNOPROTO { int getsockopt(int s, int level, int name, \ caddr_t val, int *avalsize); } 119 AUE_NULL UNIMPL -120 AUE_NULL NOPROTO { int readv(int fd, struct iovec *iovp, \ +120 AUE_NULL MNOPROTO { int readv(int fd, struct iovec *iovp, \ u_int iovcnt); } -121 AUE_NULL NOPROTO { int writev(int fd, struct iovec *iovp, \ +121 AUE_NULL MNOPROTO { int writev(int fd, struct iovec *iovp, \ u_int iovcnt); } 122 AUE_NULL UNIMPL osf_settimeofday -123 AUE_NULL NOPROTO { int fchown(int fd, int uid, int gid); } -124 AUE_NULL NOPROTO { int fchmod(int fd, int mode); } -125 AUE_NULL NOPROTO { int orecvfrom(int s, caddr_t buf, \ +123 AUE_NULL MNOPROTO { int fchown(int fd, int uid, int gid); } +124 AUE_NULL MNOPROTO { int fchmod(int fd, int mode); } +125 AUE_NULL MNOPROTO { int orecvfrom(int s, caddr_t buf, \ size_t len, int flags, caddr_t from, \ int *fromlenaddr); } recvfrom \ recvfrom_args int 126 AUE_NULL MNOPROTO { int setreuid(int ruid, int euid); } 127 AUE_NULL MNOPROTO { int setregid(int rgid, int egid); } -128 AUE_NULL STD { int linux_rename(char *from, char *to); } -129 AUE_NULL STD { int linux_truncate(char *path, \ +128 AUE_NULL MSTD { int linux_rename(char *from, char *to); } +129 AUE_NULL MSTD { int linux_truncate(char *path, \ l_ulong length); } -130 AUE_NULL NOPROTO { int oftruncate(int fd, long length); } -131 AUE_NULL NOPROTO { int flock(int fd, int how); } +130 AUE_NULL MNOPROTO { int oftruncate(int fd, long length); } +131 AUE_NULL MNOPROTO { int flock(int fd, int how); } 132 AUE_NULL MNOPROTO { int setgid(gid_t gid); } -133 AUE_NULL STD { int osf1_sendto(int s, caddr_t buf, \ +133 AUE_NULL MSTD { int osf1_sendto(int s, caddr_t buf, \ size_t len, int flags, \ struct sockaddr *to, int tolen); } -134 AUE_NULL NOPROTO { int shutdown(int s, int how); } -135 AUE_NULL STD { int linux_socketpair(void); } -136 AUE_NULL STD { int linux_mkdir(char *path, l_int mode); } -137 AUE_NULL STD { int linux_rmdir(char *path); } -138 AUE_NULL NOPROTO { int utimes(char *path, \ +134 AUE_NULL MNOPROTO { int shutdown(int s, int how); } +135 AUE_NULL MSTD { int linux_socketpair(void); } +136 AUE_NULL MSTD { int linux_mkdir(char *path, l_int mode); } +137 AUE_NULL MSTD { int linux_rmdir(char *path); } +138 AUE_NULL MNOPROTO { int utimes(char *path, \ struct timeval *tptr); } 139 AUE_NULL UNIMPL 140 AUE_NULL UNIMPL -141 AUE_NULL NOPROTO { int ogetpeername(int fdes, caddr_t asa, \ +141 AUE_NULL MNOPROTO { int ogetpeername(int fdes, caddr_t asa, \ int *alen); } 142 AUE_NULL UNIMPL 143 AUE_NULL UNIMPL @@ -249,9 +249,9 @@ struct l_rlimit *rlim); } 146 AUE_NULL UNIMPL 147 AUE_NULL MNOPROTO { int setsid(void); } -148 AUE_NULL STD { int linux_quotactl(void); } +148 AUE_NULL MSTD { int linux_quotactl(void); } 149 AUE_NULL UNIMPL -150 AUE_NULL NOPROTO { int ogetsockname(int fdec, caddr_t asa, \ +150 AUE_NULL MNOPROTO { int ogetsockname(int fdec, caddr_t asa, \ int *alen);} getsockname \ getsockname_args int 151 AUE_NULL UNIMPL @@ -306,38 +306,38 @@ 197 AUE_NULL UNIMPL 198 AUE_NULL UNIMPL 199 AUE_NULL UNIMPL osf_swapon -200 AUE_NULL STD { int linux_msgctl(l_int msqid, l_int cmd, \ +200 AUE_NULL MSTD { int linux_msgctl(l_int msqid, l_int cmd, \ struct l_msqid_ds *buf); } -201 AUE_NULL STD { int linux_msgget(l_key_t key, \ +201 AUE_NULL MSTD { int linux_msgget(l_key_t key, \ l_int msgflg); } -202 AUE_NULL STD { int linux_msgrcv(l_int msqid, \ +202 AUE_NULL MSTD { int linux_msgrcv(l_int msqid, \ struct l_msgbuf *msgp, l_size_t msgsz, \ l_long msgtyp, l_int msgflg); } -203 AUE_NULL STD { int linux_msgsnd(l_int msqid, \ +203 AUE_NULL MSTD { int linux_msgsnd(l_int msqid, \ struct l_msgbuf *msgp, l_size_t msgsz, \ l_int msgflg); } 204 AUE_NULL STD { int linux_semctl(l_int semid, \ l_int semnum, l_int cmd, \ union l_semun arg); } -205 AUE_NULL STD { int linux_semget(l_key_t key, l_int nsems, \ +205 AUE_NULL MSTD { int linux_semget(l_key_t key, l_int nsems, \ l_int semflg); } -206 AUE_NULL STD { int linux_semop(l_int semid, \ +206 AUE_NULL MSTD { int linux_semop(l_int semid, \ struct l_sembuf *tsops, l_uint nsops); } 207 AUE_NULL UNIMPL osf_utsname -208 AUE_NULL STD { int linux_lchown(char *path, l_uid_t uid, \ +208 AUE_NULL MSTD { int linux_lchown(char *path, l_uid_t uid, \ l_gid_t gid); } -209 AUE_NULL STD { int linux_shmat(l_int shmid, \ +209 AUE_NULL MSTD { int linux_shmat(l_int shmid, \ char *shmaddr, l_int shmflg); } -210 AUE_NULL STD { int linux_shmctl(l_int shmid, l_int cmd, \ +210 AUE_NULL MSTD { int linux_shmctl(l_int shmid, l_int cmd, \ struct l_shmid_ds *buf); } -211 AUE_NULL STD { int linux_shmdt(char *shmaddr); } -212 AUE_NULL STD { int linux_shmget(l_key_t key, \ +211 AUE_NULL MSTD { int linux_shmdt(char *shmaddr); } +212 AUE_NULL MSTD { int linux_shmget(l_key_t key, \ l_size_t size, l_int shmflg); } 213 AUE_NULL UNIMPL 214 AUE_NULL UNIMPL 215 AUE_NULL UNIMPL 216 AUE_NULL UNIMPL -217 AUE_NULL STD { int linux_msync(l_ulong addr, \ +217 AUE_NULL MSTD { int linux_msync(l_ulong addr, \ l_size_t len, l_int fl); } 218 AUE_NULL UNIMPL 219 AUE_NULL UNIMPL @@ -356,7 +356,7 @@ 232 AUE_NULL UNIMPL 233 AUE_NULL MNOPROTO { int getpgid(int pid); } 234 AUE_NULL MSTD { int linux_getsid(l_pid_t pid); } -235 AUE_NULL STD { int linux_sigaltstack(void); } +235 AUE_NULL MSTD { int linux_sigaltstack(void); } 236 AUE_NULL UNIMPL 237 AUE_NULL UNIMPL 238 AUE_NULL UNIMPL @@ -376,13 +376,13 @@ 251 AUE_NULL UNIMPL osf_usleep_thread 252 AUE_NULL UNIMPL 253 AUE_NULL UNIMPL -254 AUE_NULL STD { int linux_sysfs(l_int option, \ +254 AUE_NULL MSTD { int linux_sysfs(l_int option, \ l_ulong arg1, l_ulong arg2); } 255 AUE_NULL UNIMPL -256 AUE_NULL STD { int osf1_getsysinfo(u_long op, \ +256 AUE_NULL MSTD { int osf1_getsysinfo(u_long op, \ caddr_t buffer, u_long nbytes, \ caddr_t arg, u_long flag); } -257 AUE_NULL STD { int osf1_setsysinfo(u_long op, \ +257 AUE_NULL MSTD { int osf1_setsysinfo(u_long op, \ caddr_t buffer, u_long nbytes, \ caddr_t arg, u_long flag); } 258 AUE_NULL UNIMPL @@ -427,22 +427,22 @@ 297 AUE_NULL UNIMPL 298 AUE_NULL UNIMPL 299 AUE_NULL UNIMPL -300 AUE_NULL STD { int linux_bdflush(void); } -301 AUE_NULL STD { int linux_sethae(void); } +300 AUE_NULL MSTD { int linux_bdflush(void); } +301 AUE_NULL MSTD { int linux_sethae(void); } 302 AUE_NULL STD { int linux_mount(char *specialfile, \ char *dir, char *filesystemtype, \ l_ulong rwflag, void *data); } -303 AUE_NULL STD { int linux_old_adjtimex(void); } -304 AUE_NULL STD { int linux_swapoff(void); } +303 AUE_NULL MSTD { int linux_old_adjtimex(void); } +304 AUE_NULL MSTD { int linux_swapoff(void); } 305 AUE_NULL STD { int linux_getdents(l_uint fd, void *dent, \ l_uint count); } -306 AUE_NULL STD { int linux_create_module(void); } -307 AUE_NULL STD { int linux_init_module(void); } -308 AUE_NULL STD { int linux_delete_module(void); } -309 AUE_NULL STD { int linux_get_kernel_syms(void); } -310 AUE_NULL STD { int linux_syslog(l_int type, char *buf, \ +306 AUE_NULL MSTD { int linux_create_module(void); } +307 AUE_NULL MSTD { int linux_init_module(void); } +308 AUE_NULL MSTD { int linux_delete_module(void); } +309 AUE_NULL MSTD { int linux_get_kernel_syms(void); } +310 AUE_NULL MSTD { int linux_syslog(l_int type, char *buf, \ l_int len); } -311 AUE_NULL STD { int linux_reboot(l_int magic1, \ +311 AUE_NULL MSTD { int linux_reboot(l_int magic1, \ l_int magic2, l_uint cmd, void *arg); } 312 AUE_NULL MSTD { int linux_clone(l_int flags, void *stack); } 313 AUE_NULL STD { int linux_uselib(char *library); } @@ -452,21 +452,21 @@ size_t len); } 316 AUE_NULL MNOPROTO { int mlockall(int how); } 317 AUE_NULL MNOPROTO { int munlockall(void); } -318 AUE_NULL STD { int linux_sysinfo(void); } -319 AUE_NULL STD { int linux_sysctl( \ +318 AUE_NULL MSTD { int linux_sysinfo(void); } +319 AUE_NULL MSTD { int linux_sysctl( \ struct l___sysctl_args *args); } 320 AUE_NULL UNIMPL sys_idle 321 AUE_NULL STD { int linux_oldumount(char *path); } -322 AUE_NULL NOPROTO { int swapon(char *name); } -323 AUE_NULL STD { int linux_times(struct l_times_argv *buf); } -324 AUE_NULL STD { int linux_personality(l_ulong per); } -325 AUE_NULL STD { int linux_setfsuid(l_uid_t uid); } -326 AUE_NULL STD { int linux_setfsgid(l_gid_t gid); } -327 AUE_NULL STD { int linux_ustat(l_dev_t dev, \ +322 AUE_NULL MNOPROTO { int swapon(char *name); } +323 AUE_NULL MSTD { int linux_times(struct l_times_argv *buf); } +324 AUE_NULL MSTD { int linux_personality(l_ulong per); } +325 AUE_NULL MSTD { int linux_setfsuid(l_uid_t uid); } +326 AUE_NULL MSTD { int linux_setfsgid(l_gid_t gid); } +327 AUE_NULL MSTD { int linux_ustat(l_dev_t dev, \ struct l_ustat *ubuf); } -328 AUE_NULL STD { int linux_statfs(char *path, \ +328 AUE_NULL MSTD { int linux_statfs(char *path, \ struct l_statfs_buf *buf); } -329 AUE_NULL STD { int linux_fstatfs(l_uint fd, \ +329 AUE_NULL MSTD { int linux_fstatfs(l_uint fd, \ struct l_statfs_buf *buf); } 330 AUE_NULL MNOPROTO { int sched_setparam(pid_t pid, \ const struct sched_param *param); } @@ -481,43 +481,43 @@ l_int policy); } 336 AUE_NULL MSTD { int linux_sched_get_priority_min( \ l_int policy); } -337 AUE_NULL NOPROTO { int sched_rr_get_interval (pid_t pid, \ +337 AUE_NULL MNOPROTO { int sched_rr_get_interval (pid_t pid, \ struct timespec *interval); } 338 AUE_NULL UNIMPL sys_afs_syscall -339 AUE_NULL STD { int linux_newuname( \ +339 AUE_NULL MSTD { int linux_newuname( \ struct l_newuname_t *buf); } 340 AUE_NULL MNOPROTO { int nanosleep( \ const struct timespec *rqtp, \ struct timespec *rmtp); } -341 AUE_NULL STD { int linux_mremap(l_ulong addr, \ +341 AUE_NULL MSTD { int linux_mremap(l_ulong addr, \ l_ulong old_len, l_ulong new_len, \ l_ulong flags, l_ulong new_addr); } -342 AUE_NULL STD { int linux_nfsservctl(void); } +342 AUE_NULL MSTD { int linux_nfsservctl(void); } 343 AUE_NULL MNOPROTO { int setresuid(uid_t ruid, \ uid_t euid, uid_t suid); } 344 AUE_NULL MNOPROTO { int getresuid(uid_t *ruid, \ uid_t *euid, uid_t *suid); } -345 AUE_NULL STD { int linux_pciconfig_read(void); } -346 AUE_NULL STD { int linux_pciconfig_write(void); } -347 AUE_NULL STD { int linux_query_module(void); } -348 AUE_NULL STD { int linux_prctl(void); } -349 AUE_NULL STD { int linux_pread(l_uint fd, char *buf, \ +345 AUE_NULL MSTD { int linux_pciconfig_read(void); } +346 AUE_NULL MSTD { int linux_pciconfig_write(void); } +347 AUE_NULL MSTD { int linux_query_module(void); } +348 AUE_NULL MSTD { int linux_prctl(void); } +349 AUE_NULL MSTD { int linux_pread(l_uint fd, char *buf, \ l_size_t nbyte, l_loff_t offset); } -350 AUE_NULL STD { int linux_pwrite(l_uint fd, char *buf, \ +350 AUE_NULL MSTD { int linux_pwrite(l_uint fd, char *buf, \ l_size_t nbyte, l_loff_t offset); } -351 AUE_NULL STD { int linux_rt_sigreturn(void); } +351 AUE_NULL MSTD { int linux_rt_sigreturn(void); } 352 AUE_NULL MSTD { int linux_rt_sigaction(l_int sig, \ l_sigaction_t *act, l_sigaction_t *oact, \ l_size_t sigsetsize); } 353 AUE_NULL MSTD { int linux_rt_sigprocmask(l_int how, \ l_sigset_t *mask, l_sigset_t *omask, \ l_size_t sigsetsize); } -354 AUE_NULL STD { int linux_rt_sigpending(void); } -355 AUE_NULL STD { int linux_rt_sigtimedwait(void); } -356 AUE_NULL STD { int linux_rt_sigqueueinfo(void); } +354 AUE_NULL MSTD { int linux_rt_sigpending(void); } +355 AUE_NULL MSTD { int linux_rt_sigtimedwait(void); } +356 AUE_NULL MSTD { int linux_rt_sigqueueinfo(void); } 357 AUE_NULL MSTD { int linux_rt_sigsuspend(l_sigset_t \ *newset, l_size_t sigsetsize); } -358 AUE_NULL STD { int linux_select(l_int nfds, \ +358 AUE_NULL MSTD { int linux_select(l_int nfds, \ l_fd_set *readfds, l_fd_set *writefds, \ l_fd_set *exceptfds, \ struct l_timeval *timeout); } @@ -532,27 +532,27 @@ 362 AUE_NULL MSTD { int linux_setitimer(l_int which, \ struct l_itimerval *itv, \ struct l_itimerval *oitv); } -363 AUE_NULL STD { int linux_utimes(char *fname, \ +363 AUE_NULL MSTD { int linux_utimes(char *fname, \ struct l_timeval *times); } 364 AUE_NULL MNOPROTO { int getrusage(int who, \ struct rusage *rusage); } 365 AUE_NULL MSTD { int linux_wait4(l_pid_t pid, \ l_uint *status, l_int options, \ struct l_rusage *rusage); } -366 AUE_NULL STD { int linux_adjtimex(void); } -367 AUE_NULL STD { int linux_getcwd(char *buf, \ +366 AUE_NULL MSTD { int linux_adjtimex(void); } +367 AUE_NULL MSTD { int linux_getcwd(char *buf, \ l_ulong bufsize); } -368 AUE_NULL STD { int linux_capget(void); } -369 AUE_NULL STD { int linux_capset(void); } -370 AUE_NULL STD { int linux_sendfile(void); } +368 AUE_NULL MSTD { int linux_capget(void); } +369 AUE_NULL MSTD { int linux_capset(void); } +370 AUE_NULL MSTD { int linux_sendfile(void); } 371 AUE_NULL MNOPROTO { int setresgid(gid_t rgid, \ gid_t egid, gid_t sgid); } 372 AUE_NULL MNOPROTO { int getresgid(gid_t *rgid, \ gid_t *egid, gid_t *sgid); } 373 AUE_NULL UNIMPL sys_dipc -374 AUE_NULL STD { int linux_pivot_root(char *new_root, \ +374 AUE_NULL MSTD { int linux_pivot_root(char *new_root, \ char *put_old); } -375 AUE_NULL STD { int linux_mincore(l_ulong start, \ +375 AUE_NULL MSTD { int linux_mincore(l_ulong start, \ l_size_t len, u_char *vec); } -376 AUE_NULL STD { int linux_pciconfig_iobase(void); } +376 AUE_NULL MSTD { int linux_pciconfig_iobase(void); } 377 AUE_NULL STD { int linux_getdents64(l_uint fd, void *dirent, l_uint count); } ==== //depot/projects/smpng/sys/alpha/osf1/osf1_proto.h#10 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/osf1/osf1_proto.h,v 1.12 2005/05/30 15:20:17 rwatson Exp $ - * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.11 2005/05/30 15:09:16 rwatson Exp + * $FreeBSD: src/sys/alpha/osf1/osf1_proto.h,v 1.13 2005/07/13 20:35:07 jhb Exp $ + * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.12 2005/07/13 20:32:42 jhb Exp */ #ifndef _OSF1_SYSPROTO_H_ ==== //depot/projects/smpng/sys/alpha/osf1/osf1_syscall.h#9 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/osf1/osf1_syscall.h,v 1.11 2005/05/30 15:20:17 rwatson Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jul 13 22:24:44 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41E2716A420; Wed, 13 Jul 2005 22:24:44 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1843516A41C for ; Wed, 13 Jul 2005 22:24:44 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF67F43D48 for ; Wed, 13 Jul 2005 22:24:43 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6DMOheH007293 for ; Wed, 13 Jul 2005 22:24:43 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6DMOh64007290 for perforce@freebsd.org; Wed, 13 Jul 2005 22:24:43 GMT (envelope-from wsalamon@computer.org) Date: Wed, 13 Jul 2005 22:24:43 GMT Message-Id: <200507132224.j6DMOh64007290@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 80109 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jul 2005 22:24:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=80109 Change 80109 by wsalamon@rickenbacker on 2005/07/13 22:24:27 Use the auditon() syscall to turn off auditing because NULL is an invalid parameter to auditctl(). Affected files ... .. //depot/projects/trustedbsd/audit3/usr.sbin/auditon/auditon.c#6 edit Differences ... ==== //depot/projects/trustedbsd/audit3/usr.sbin/auditon/auditon.c#6 (text+ko) ==== @@ -51,12 +51,14 @@ main(int argc, char *argv[]) { const char *path; + long cond; if (argc != 2) usage(); if (strcmp(argv[1], "off") == 0) { - if (auditctl(NULL) != 0) + cond = AUC_DISABLED; + if (auditon(A_SETCOND, &cond, sizeof(cond)) != 0) errx(-1, "Shutdown %s", strerror(errno)); } else { path = argv[1]; From owner-p4-projects@FreeBSD.ORG Wed Jul 13 22:47:12 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D94D16A420; Wed, 13 Jul 2005 22:47:12 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BCC6F16A41C for ; Wed, 13 Jul 2005 22:47:11 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C9CF43D55 for ; Wed, 13 Jul 2005 22:47:11 +0000 (GMT) (envelope-from cognet@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6DMlB2k008129 for ; Wed, 13 Jul 2005 22:47:11 GMT (envelope-from cognet@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6DMlBcU008126 for perforce@freebsd.org; Wed, 13 Jul 2005 22:47:11 GMT (envelope-from cognet@freebsd.org) Date: Wed, 13 Jul 2005 22:47:11 GMT Message-Id: <200507132247.j6DMlBcU008126@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cognet@freebsd.org using -f From: Olivier Houchard To: Perforce Change Reviews Cc: Subject: PERFORCE change 80110 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jul 2005 22:47:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=80110 Change 80110 by cognet@cognet on 2005/07/13 22:46:26 Make it so we can build an arm cross-debugger. Affected files ... .. //depot/projects/arm/gnu-arm.diff#4 edit Differences ... ==== //depot/projects/arm/gnu-arm.diff#4 (text+ko) ==== @@ -4,7 +4,7 @@ retrieving revision 1.54 diff -u -p -r1.54 Makefile --- gnu/lib/libgcc/Makefile 21 Dec 2004 09:33:45 -0000 1.54 -+++ gnu/lib/libgcc/Makefile 27 Feb 2005 21:18:24 -0000 ++++ gnu/lib/libgcc/Makefile 29 Jun 2005 12:06:56 -0000 @@ -97,8 +97,11 @@ LIB2FUNCS_EXTRA = qrnnd.asm # from config/arm/t-strongarm-elf CFLAGS+= -Dinhibit_libc -fno-inline @@ -15,7 +15,7 @@ +# _truncdfsf2 _fixdfsi _extendsfdf2 _fixsfsi _cmpdf2 _cmpsf2 \ +# _muldivdf3 _muldivsf3 +#XXX -+LIB1ASMFUNCS = _dvmd_tls _bb_init_func ++LIB1ASMFUNCS = _dvmd_tls _bb_init_func # We want fine grained libraries, so use the new code to build the # floating point emulation libraries. XXX fix this: NEED_FP_EMULATION set to "yes" with different rules per platform @@ -31,10 +31,10 @@ Index: gnu/lib/libstdc++/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/lib/libstdc++/Makefile,v -retrieving revision 1.54 -diff -u -p -r1.54 Makefile ---- gnu/lib/libstdc++/Makefile 26 Jan 2005 13:56:27 -0000 1.54 -+++ gnu/lib/libstdc++/Makefile 27 Feb 2005 21:18:25 -0000 +retrieving revision 1.55 +diff -u -p -r1.55 Makefile +--- gnu/lib/libstdc++/Makefile 22 Apr 2005 18:57:32 -0000 1.55 ++++ gnu/lib/libstdc++/Makefile 3 May 2005 00:45:54 -0000 @@ -174,6 +174,10 @@ TARGETHDRSNAME_c_locale.h= c++locale.h TARGETHDRSNAME_new_allocator_base.h= c++allocator.h TARGETHDRSDIR= ${CXXINCLUDEDIR}/bits @@ -49,12 +49,12 @@ Index: gnu/usr.bin/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/Makefile,v -retrieving revision 1.83 -diff -u -p -r1.83 Makefile ---- gnu/usr.bin/Makefile 24 Oct 2004 15:32:25 -0000 1.83 -+++ gnu/usr.bin/Makefile 27 Feb 2005 20:53:55 -0000 -@@ -23,7 +23,7 @@ SUBDIR= bc \ - tar \ +retrieving revision 1.84 +diff -u -p -r1.84 Makefile +--- gnu/usr.bin/Makefile 21 Mar 2005 05:30:58 -0000 1.84 ++++ gnu/usr.bin/Makefile 5 Apr 2005 18:34:42 -0000 +@@ -22,7 +22,7 @@ SUBDIR= bc \ + sort \ texinfo -.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc" @@ -67,7 +67,7 @@ RCS file: gnu/usr.bin/binutils/as/arm-freebsd/targ-cpu.h diff -N gnu/usr.bin/binutils/as/arm-freebsd/targ-cpu.h --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gnu/usr.bin/binutils/as/arm-freebsd/targ-cpu.h 21 Oct 2004 21:30:12 -0000 ++++ gnu/usr.bin/binutils/as/arm-freebsd/targ-cpu.h 5 Apr 2005 18:34:42 -0000 @@ -0,0 +1,3 @@ +/* $FreeBSD$ */ + @@ -77,7 +77,7 @@ RCS file: gnu/usr.bin/binutils/ld/Makefile.arm diff -N gnu/usr.bin/binutils/ld/Makefile.arm --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gnu/usr.bin/binutils/ld/Makefile.arm 21 Oct 2004 21:30:12 -0000 ++++ gnu/usr.bin/binutils/ld/Makefile.arm 5 Apr 2005 18:34:42 -0000 @@ -0,0 +1,12 @@ +# $FreeBSD$ + @@ -96,8 +96,8 @@ RCS file: gnu/usr.bin/binutils/libbfd/Makefile.arm diff -N gnu/usr.bin/binutils/libbfd/Makefile.arm --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gnu/usr.bin/binutils/libbfd/Makefile.arm 18 Jan 2005 12:04:26 -0000 -@@ -0,0 +1,20 @@ ++++ gnu/usr.bin/binutils/libbfd/Makefile.arm 11 May 2005 22:50:52 -0000 +@@ -0,0 +1,24 @@ +# $FreeBSD$ + +DEFAULT_VECTOR= bfd_elf32_littlearm_vec @@ -109,6 +109,7 @@ + elflink.c \ + elfarm-nabi.c \ + elfarm-oabi.c \ ++ elf32-arm-fbsd.c \ + elf32-target.h +VECS+= ${DEFAULT_VECTOR} \ + bfd_elf32_bigarm_vec @@ -117,13 +118,16 @@ +CFLAGS+= -DDEFAULT_VECTOR=${DEFAULT_VECTOR} +.endif + -+CLEANFILES+= elf32-target.h ++CLEANFILES+= elf32-arm-fbsd.c ++ ++elf32-arm-fbsd.c: elfarm-nabi.c ++ cat ${.ALLSRC} | sed s/ELFOSABI_ARM/ELFOSABI_FREEBSD/g >${.TARGET} Index: gnu/usr.bin/binutils/libopcodes/Makefile.arm =================================================================== RCS file: gnu/usr.bin/binutils/libopcodes/Makefile.arm diff -N gnu/usr.bin/binutils/libopcodes/Makefile.arm --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gnu/usr.bin/binutils/libopcodes/Makefile.arm 21 Oct 2004 21:30:12 -0000 ++++ gnu/usr.bin/binutils/libopcodes/Makefile.arm 5 Apr 2005 18:34:42 -0000 @@ -0,0 +1,4 @@ +# $FreeBSD$ + @@ -132,10 +136,10 @@ Index: gnu/usr.bin/cc/cc_tools/Makefile =================================================================== RCS file: /home/ncvs/src/gnu/usr.bin/cc/cc_tools/Makefile,v -retrieving revision 1.80 -diff -u -p -r1.80 Makefile ---- gnu/usr.bin/cc/cc_tools/Makefile 18 Aug 2004 13:21:40 -0000 1.80 -+++ gnu/usr.bin/cc/cc_tools/Makefile 21 Oct 2004 21:30:12 -0000 +retrieving revision 1.81 +diff -u -p -r1.81 Makefile +--- gnu/usr.bin/cc/cc_tools/Makefile 3 Jun 2005 04:21:04 -0000 1.81 ++++ gnu/usr.bin/cc/cc_tools/Makefile 7 Jun 2005 20:16:03 -0000 @@ -214,7 +214,9 @@ CLEANFILES+= fini .if ${TARGET_ARCH} == "amd64" TARGET_INC= i386/biarch64.h @@ -164,7 +168,7 @@ retrieving revision 1.18 diff -u -p -r1.18 auto-host.h --- gnu/usr.bin/cc/cc_tools/auto-host.h 28 Jul 2004 05:27:20 -0000 1.18 -+++ gnu/usr.bin/cc/cc_tools/auto-host.h 21 Oct 2004 21:30:12 -0000 ++++ gnu/usr.bin/cc/cc_tools/auto-host.h 5 Apr 2005 18:34:42 -0000 @@ -523,7 +523,7 @@ /* The number of bytes in type int */ #define SIZEOF_INT 4 @@ -179,12 +183,15 @@ RCS file: gnu/usr.bin/gdb/arch/arm/Makefile diff -N gnu/usr.bin/gdb/arch/arm/Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gnu/usr.bin/gdb/arch/arm/Makefile 10 Jan 2005 21:40:04 -0000 -@@ -0,0 +1,13 @@ ++++ gnu/usr.bin/gdb/arch/arm/Makefile 13 Jul 2005 22:33:32 -0000 +@@ -0,0 +1,16 @@ +# $FreeBSD$ + +GENSRCS+= xm.h -+LIBSRCS+= arm-tdep.c armfbsd-nat.c armfbsd-tdep.c solib.c solib-svr4.c ++.if !defined(GDB_CROSS_DEBUGGER) ++LIBSRCS+= armfbsd-nat.c ++.endif ++LIBSRCS+= arm-tdep.c armfbsd-tdep.c solib.c solib-svr4.c + +nm.h: + echo '#include "arm/nm-fbsd.h"' > ${.TARGET} @@ -199,7 +206,7 @@ RCS file: gnu/usr.bin/gdb/arch/arm/config.h diff -N gnu/usr.bin/gdb/arch/arm/config.h --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gnu/usr.bin/gdb/arch/arm/config.h 15 Jan 2005 15:50:12 -0000 ++++ gnu/usr.bin/gdb/arch/arm/config.h 5 Apr 2005 18:34:42 -0000 @@ -0,0 +1,553 @@ +/* $FreeBSD$ */ + @@ -759,8 +766,8 @@ RCS file: gnu/usr.bin/gdb/arch/arm/init.c diff -N gnu/usr.bin/gdb/arch/arm/init.c --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gnu/usr.bin/gdb/arch/arm/init.c 28 Nov 2004 14:53:48 -0000 -@@ -0,0 +1,222 @@ ++++ gnu/usr.bin/gdb/arch/arm/init.c 13 Jul 2005 22:42:31 -0000 +@@ -0,0 +1,226 @@ +/* $FreeBSD$ */ + +/* Do not modify this file. */ @@ -776,10 +783,12 @@ +extern initialize_file_ftype _initialize_ser_hardwire; +extern initialize_file_ftype _initialize_ser_pipe; +extern initialize_file_ftype _initialize_ser_tcp; ++#ifndef CROSS_DEBUGGER +extern initialize_file_ftype _initialize_kernel_u_addr; +extern initialize_file_ftype _initialize_infptrace; +extern initialize_file_ftype _initialize_inftarg; +extern initialize_file_ftype _initialize_arm_fbsdnat; ++#endif +extern initialize_file_ftype _initialize_remote; +extern initialize_file_ftype _initialize_dcache; +extern initialize_file_ftype _initialize_sr_support; @@ -885,10 +894,12 @@ + _initialize_ser_hardwire (); + _initialize_ser_pipe (); + _initialize_ser_tcp (); ++#ifndef CROSS_DEBUGGER + _initialize_kernel_u_addr (); + _initialize_infptrace (); + _initialize_inftarg (); + _initialize_arm_fbsdnat (); ++#endif + _initialize_remote (); + _initialize_dcache (); + _initialize_sr_support (); @@ -988,8 +999,8 @@ RCS file: gnu/usr.bin/gdb/kgdb/trgt_arm.c diff -N gnu/usr.bin/gdb/kgdb/trgt_arm.c --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ gnu/usr.bin/gdb/kgdb/trgt_arm.c 28 Nov 2004 14:36:26 -0000 -@@ -0,0 +1,54 @@ ++++ gnu/usr.bin/gdb/kgdb/trgt_arm.c 13 Jul 2005 22:44:44 -0000 +@@ -0,0 +1,67 @@ +/* + * Copyright (c) 2004 Marcel Moolenaar + * All rights reserved. @@ -1032,11 +1043,24 @@ +#include +#include +#include ++#include + +void +kgdb_trgt_fetch_registers(int regno __unused) +{ -+ fprintf_unfiltered(gdb_stderr, "XXX: %s\n", __func__); ++ struct kthr *kt; ++ struct pcb pcb; ++ int i; ++ ++ kt = kgdb_thr_lookup_tid(ptid_get_tid(inferior_ptid)); ++ if (kt == NULL) ++ return; ++ if (kvm_read(kvm, kt->pcb, &pcb, sizeof(pcb)) != sizeof(pcb)) { ++ warnx("kvm_read: %s", kvm_geterr(kvm)); ++ memset(&pcb, 0, sizeof(pcb)); ++ } ++ for (i = ARM_A1_REGNUM + 9; i <= ARM_PC_REGNUM; i++) ++ supply_register(i, (char *)&pcb + i * 4); +} + +void From owner-p4-projects@FreeBSD.ORG Thu Jul 14 07:52:36 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A2E7E16A420; Thu, 14 Jul 2005 07:52:35 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 78F6816A41C for ; Thu, 14 Jul 2005 07:52:35 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3550043D48 for ; Thu, 14 Jul 2005 07:52:35 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6E7qYQe044037 for ; Thu, 14 Jul 2005 07:52:35 GMT (envelope-from soc-saturnero@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6E7qYvG044034 for perforce@freebsd.org; Thu, 14 Jul 2005 07:52:34 GMT (envelope-from soc-saturnero@freebsd.org) Date: Thu, 14 Jul 2005 07:52:34 GMT Message-Id: <200507140752.j6E7qYvG044034@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-saturnero@freebsd.org using -f From: soc-saturnero To: Perforce Change Reviews Cc: Subject: PERFORCE change 80121 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jul 2005 07:52:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=80121 Change 80121 by soc-saturnero@soc-saturnero_sberta on 2005/07/14 07:51:59 Move kernel configuration files to ${ARCH} subdir Affected files ... .. //depot/projects/soc2005/freesbie/conf/FREESBIE.amd64#2 delete .. //depot/projects/soc2005/freesbie/conf/FREESBIE.i386#2 delete .. //depot/projects/soc2005/freesbie/conf/FREESBIE.powerpc#2 delete .. //depot/projects/soc2005/freesbie/conf/amd64/FREESBIE#1 add .. //depot/projects/soc2005/freesbie/conf/i386/FREESBIE#1 add .. //depot/projects/soc2005/freesbie/conf/powerpc/FREESBIE#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jul 14 08:37:32 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5AF616A41C; Thu, 14 Jul 2005 08:37:31 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6FC2216A433 for ; Thu, 14 Jul 2005 08:37:31 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C04943D49 for ; Thu, 14 Jul 2005 08:37:31 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6E8bVrS046037 for ; Thu, 14 Jul 2005 08:37:31 GMT (envelope-from soc-saturnero@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6E8bUo5046033 for perforce@freebsd.org; Thu, 14 Jul 2005 08:37:30 GMT (envelope-from soc-saturnero@freebsd.org) Date: Thu, 14 Jul 2005 08:37:30 GMT Message-Id: <200507140837.j6E8bUo5046033@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-saturnero@freebsd.org using -f From: soc-saturnero To: Perforce Change Reviews Cc: Subject: PERFORCE change 80123 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jul 2005 08:37:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=80123 Change 80123 by soc-saturnero@soc-saturnero_sberta on 2005/07/14 08:36:46 Added todo list and default make.conf* Affected files ... .. //depot/projects/soc2005/freesbie/ToDo#1 add .. //depot/projects/soc2005/freesbie/conf/make.conf#1 add .. //depot/projects/soc2005/freesbie/conf/make.conf.minimal#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jul 14 11:49:34 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1AD3F16A420; Thu, 14 Jul 2005 11:49:34 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E97E316A41C for ; Thu, 14 Jul 2005 11:49:33 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8AF4F43D5C for ; Thu, 14 Jul 2005 11:49:33 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6EBnXBp065082 for ; Thu, 14 Jul 2005 11:49:33 GMT (envelope-from soc-saturnero@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6EBnX8C065079 for perforce@freebsd.org; Thu, 14 Jul 2005 11:49:33 GMT (envelope-from soc-saturnero@freebsd.org) Date: Thu, 14 Jul 2005 11:49:33 GMT Message-Id: <200507141149.j6EBnX8C065079@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-saturnero@freebsd.org using -f From: soc-saturnero To: Perforce Change Reviews Cc: Subject: PERFORCE change 80132 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jul 2005 11:49:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=80132 Change 80132 by soc-saturnero@soc-saturnero_sberta on 2005/07/14 11:49:22 Initial default configuration file Affected files ... .. //depot/projects/soc2005/freesbie/conf/freesbie.defaults.conf#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jul 14 12:39:41 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A70AD16A420; Thu, 14 Jul 2005 12:39:40 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 52EE616A41C for ; Thu, 14 Jul 2005 12:39:40 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0843043D48 for ; Thu, 14 Jul 2005 12:39:40 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6ECdecK068456 for ; Thu, 14 Jul 2005 12:39:40 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6ECddms068452 for perforce@freebsd.org; Thu, 14 Jul 2005 12:39:39 GMT (envelope-from soc-bushman@freebsd.org) Date: Thu, 14 Jul 2005 12:39:39 GMT Message-Id: <200507141239.j6ECddms068452@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 80147 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jul 2005 12:39:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=80147 Change 80147 by soc-bushman@soc-bushman_stinger on 2005/07/14 12:39:36 rpc almost finished, most of tests for getserv* done Affected files ... .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getservent.c#11 edit .. //depot/projects/soc2005/nsswitch_cached/tests/Makefile#1 add .. //depot/projects/soc2005/nsswitch_cached/tests/common/test.c#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/getrpcent_test/Makefile#1 add .. //depot/projects/soc2005/nsswitch_cached/tests/getrpcent_test/getrpcent.c#1 add .. //depot/projects/soc2005/nsswitch_cached/tests/getrpcent_test/getrpcent.h#1 add .. //depot/projects/soc2005/nsswitch_cached/tests/getrpcent_test/getrpcent_test.c#1 add .. //depot/projects/soc2005/nsswitch_cached/tests/getservent_test/Makefile#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/getservent_test/getservent.c#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/getservent_test/getservent.h#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/getservent_test/getservent_test.c#2 edit Differences ... ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getservent.c#11 (text+ko) ==== @@ -132,14 +132,14 @@ }; }; -static int wrap_getservbyname_r(struct key key, struct servent *serv, char *buffer, - size_t bufsize, struct servent **res); -static int wrap_getservbyport_r(struct key key, struct servent *serv, char *buffer, - size_t bufsize, struct servent **res); -static int wrap_getservent_r(struct key key, struct servent *serv, char *buffer, - size_t bufsize, struct servent **res); +static int wrap_getservbyname_r(struct key, struct servent *, char *, + size_t, struct servent **); +static int wrap_getservbyport_r(struct key, struct servent *, char *, + size_t, struct servent **); +static int wrap_getservent_r(struct key, struct servent *, char *, + size_t, struct servent **); static struct servent *getserv(int (*fn)(struct key, struct servent *, char *, - size_t, struct servent **), struct key key); + size_t, struct servent **), struct key); static int @@ -364,6 +364,7 @@ } } + rv = NS_NOTFOUND; switch (serv_mdata->how) { case nss_lt_name: if (strcmp(name, serv->s_name) == 0) @@ -432,8 +433,8 @@ default: break; }; + st->compat_mode_active = 0; - return (NS_UNAVAIL); } @@ -549,7 +550,6 @@ rv = yp_first(st->yp_domain, "services.byname", &st->yp_key, &st->yp_keylen, &resultbuf, &resultbuflen); if (rv) { - st->yp_stepping = 0; rv = NS_NOTFOUND; goto fin; } @@ -660,9 +660,9 @@ break; case ENDSERVENT: (void)nsdispatch(retval, compat_dtab, NSDB_SERVICES_COMPAT, "endservent", compat_src); - break; + break; default: - break; + break; } return (NS_UNAVAIL); @@ -699,7 +699,7 @@ } int -getservbyport_r(int port, const char *proto, struct servent *serv, char *buffer, +getservbyport_r)(int port, const char *proto, struct servent *serv, char *buffer, size_t bufsize, struct servent **result) { static const struct servent_mdata mdata = { nss_lt_id, 0 }; @@ -813,7 +813,7 @@ wrap_getservent_r(struct key key, struct servent *serv, char *buffer, size_t bufsize, struct servent **res) { - return (getservent_r(serv, buffer, bufsize, res)); + return getservent_r(serv, buffer, bufsize, res)); } static struct servent * @@ -853,6 +853,7 @@ } while (res == NULL && rv == ERANGE); if (rv != 0) errno = rv; + return (res); } @@ -861,8 +862,8 @@ { struct key key; - key.name=name; - key.proto=proto; + key.name = name; + key.proto = proto; return (getserv(wrap_getservbyname_r, key)); } @@ -872,8 +873,8 @@ { struct key key; - key.port=port; - key.proto=proto; + key.port = port; + key.proto = proto; return (getserv(wrap_getservbyport_r, key)); } @@ -882,9 +883,9 @@ getservent() { struct key key; - - key.proto=NULL; - key.port=0; + + key.proto =NULL; + key.port = 0; return (getserv(wrap_getservent_r, key)); } ==== //depot/projects/soc2005/nsswitch_cached/tests/common/test.c#2 (text+ko) ==== @@ -111,6 +111,9 @@ break; } __test_log1("<== %s\n\n", test->name); + + if (retval == T_FAILED) + break; } if (retval == T_PASSED) ==== //depot/projects/soc2005/nsswitch_cached/tests/getservent_test/Makefile#2 (text+ko) ==== @@ -4,8 +4,6 @@ PROGNAME=getservent_test MAN= -YP=1 - SRCS=getservent_test.c getservent.c WARNS?=2 CFLAGS+= -I${.CURDIR}/../../src/lib/libc -I${.CURDIR}/../../src/lib/libc/include ==== //depot/projects/soc2005/nsswitch_cached/tests/getservent_test/getservent.c#2 (text+ko) ==== @@ -134,14 +134,14 @@ }; }; -static int wrap_getservbyname_r(struct key key, struct servent *serv, char *buffer, - size_t bufsize, struct servent **res); -static int wrap_getservbyport_r(struct key key, struct servent *serv, char *buffer, - size_t bufsize, struct servent **res); -static int wrap_getservent_r(struct key key, struct servent *serv, char *buffer, - size_t bufsize, struct servent **res); +static int wrap_getservbyname_r(struct key, struct servent *, char *, + size_t, struct servent **); +static int wrap_getservbyport_r(struct key, struct servent *, char *, + size_t, struct servent **); +static int wrap_getservent_r(struct key, struct servent *, char *, + size_t, struct servent **); static struct servent *getserv(int (*fn)(struct key, struct servent *, char *, - size_t, struct servent **), struct key key); + size_t, struct servent **), struct key); static int @@ -366,6 +366,7 @@ } } + rv = NS_NOTFOUND; switch (serv_mdata->how) { case nss_lt_name: if (strcmp(name, serv->s_name) == 0) @@ -434,8 +435,8 @@ default: break; }; + st->compat_mode_active = 0; - return (NS_UNAVAIL); } @@ -551,7 +552,6 @@ rv = yp_first(st->yp_domain, "services.byname", &st->yp_key, &st->yp_keylen, &resultbuf, &resultbuflen); if (rv) { - st->yp_stepping = 0; rv = NS_NOTFOUND; goto fin; } @@ -662,9 +662,9 @@ break; case ENDSERVENT: (void)nsdispatch(retval, compat_dtab, NSDB_SERVICES_COMPAT, "endservent", compat_src); - break; + break; default: - break; + break; } return (NS_UNAVAIL); @@ -855,6 +855,7 @@ } while (res == NULL && rv == ERANGE); if (rv != 0) errno = rv; + return (res); } @@ -863,8 +864,8 @@ { struct key key; - key.name=name; - key.proto=proto; + key.name = name; + key.proto = proto; return (getserv(wrap_getservbyname_r, key)); } @@ -874,8 +875,8 @@ { struct key key; - key.port=port; - key.proto=proto; + key.port = port; + key.proto = proto; return (getserv(wrap_getservbyport_r, key)); } @@ -884,9 +885,9 @@ DECORATED(getservent)() { struct key key; - - key.proto=NULL; - key.port=0; + + key.proto =NULL; + key.port = 0; return (getserv(wrap_getservent_r, key)); } ==== //depot/projects/soc2005/nsswitch_cached/tests/getservent_test/getservent.h#2 (text+ko) ==== @@ -6,6 +6,8 @@ #include "../common/debug.h" #include +#define NSDB_SERVICES_COMPAT "services_compat" + int DECORATED(getservbyname_r)(const char *, const char *, struct servent *, char *, size_t, struct servent **); int DECORATED(getservbyport_r)(int, const char *, struct servent *, char *, ==== //depot/projects/soc2005/nsswitch_cached/tests/getservent_test/getservent_test.c#2 (text+ko) ==== @@ -8,6 +8,59 @@ #include #include +static struct servent * +clone_servent(struct servent *serv) +{ + struct servent *res; + char **cp; + int aliases_num; + + if (serv == NULL) + return (NULL); + + res = (struct servent *)malloc(sizeof(struct servent)); + assert(res != NULL); + memset(res, 0, sizeof(struct servent)); + + res->s_name = strdup(serv->s_name); + assert(res->s_name != NULL); + res->s_proto = strdup(serv->s_proto); + assert(res->s_proto != NULL); + res->s_port = serv->s_port; + + aliases_num = 0; + for (cp = serv->s_aliases; *cp; ++cp) + ++aliases_num; + + res->s_aliases = (char **)malloc((aliases_num+1) * (sizeof(char *))); + assert(res->s_aliases != NULL); + memset(res->s_aliases, 0, (aliases_num+1) * (sizeof(char *))); + + for (cp = serv->s_aliases; *cp; ++cp) { + res->s_aliases[cp - serv->s_aliases] = strdup(*cp); + assert(res->s_aliases[cp - serv->s_aliases] != NULL); + } + + return res; +} + +static void +free_servent(struct servent *serv) +{ + char **cp; + + if (serv == NULL) + return; + + free(serv->s_name); + free(serv->s_proto); + + for (cp = serv->s_aliases; *cp; ++cp) + free(*cp); + + free(serv); +} + static void result_info(int rv, struct servent *result) { @@ -138,6 +191,252 @@ return ((rv == 0) && (errno == 0)) ? T_PASSED : T_FAILED; } +struct servent * +trivial_getservbyname(const char *name, const char *proto) +{ + char **cp; + struct servent *result; + + DECORATED(setservent)(1); + while ( (result = DECORATED(getservent)()) != NULL) { + if (strcmp(result->s_name, name) == 0) + goto gotname; + + for (cp=result->s_aliases; *cp; ++cp) + if (strcmp(*cp, name) == 0) + goto gotname; + + continue; + +gotname: + if (strcmp(result->s_proto, proto) == 0) + break; + } + + DECORATED(endservent)(); + return (result); +} + +struct servent * +trivial_getservbyport(int port, const char *proto) +{ + struct servent *result; + + DECORATED(setservent)(1); + while ( (result = DECORATED(getservent)()) != NULL) { + if ((result->s_port == port) && (strcmp(result->s_proto, proto) == 0)) + break; + } + + DECORATED(endservent)(); + return (result); +} + +static enum __test_result +getservbyname_test2() +{ + struct servent *result_model; + struct servent *result1; + struct servent *result2; + + int rv; + char **cp; + + setservent(1); + while ( (result_model = getservent()) != NULL) { + __test_log2("trying name: %s, proto: %s\n", result_model->s_name, result_model->s_proto); + + result1 = clone_servent( DECORATED(getservbyname)(result_model->s_name, result_model->s_proto) ); + result2 = clone_servent( trivial_getservbyname(result_model->s_name, result_model->s_proto) ); + +// result_info(errno, result1); +// result_info(errno, result2); + + rv = result_compare(result1, result2); + free_servent(result1); + free_servent(result2); + if (rv != 0) + break; + + for (cp = result_model->s_aliases; *cp; ++cp) + { + __test_log2("trying name: %s, proto: %s\n", *cp, result_model->s_proto); + + result1 = clone_servent( DECORATED(getservbyname)(*cp, result_model->s_proto) ); + result2 = clone_servent( trivial_getservbyname(*cp, result_model->s_proto) ); + + rv = result_compare(result1, result2); + free_servent(result1); + free_servent(result2); + if (rv != 0) + break; + } + + if (rv != 0) + break; + } + + endservent(); + return ((rv == 0) && (errno == 0)) ? T_PASSED : T_FAILED; +} + +static enum __test_result +getservbyname_test3() +{ + struct servent *result_model; + struct servent *result1; + struct servent *result2; + + int counter; + int rv; + char **cp; + + counter = 0; + setservent(1); + while ( (result_model = getservent()) != NULL) { + switch (counter % 3) { + case 0: + break; + case 1: + result_model->s_name[0] = 'a'; + break; + case 2: + result_model->s_proto[0] = 'b'; + break; + } + __test_log2("trying name: %s, proto: %s\n", result_model->s_name, result_model->s_proto); + + result1 = clone_servent( DECORATED(getservbyname)(result_model->s_name, result_model->s_proto) ); + result2 = clone_servent( trivial_getservbyname(result_model->s_name, result_model->s_proto) ); + +// result_info(errno, result1); +// result_info(errno, result2); + + rv = result_compare(result1, result2); + free_servent(result1); + free_servent(result2); + if (rv != 0) + break; + + for (cp = result_model->s_aliases; *cp; ++cp) + { + __test_log2("trying name: %s, proto: %s\n", *cp, result_model->s_proto); + + result1 = clone_servent( DECORATED(getservbyname)(*cp, result_model->s_proto) ); + result2 = clone_servent( trivial_getservbyname(*cp, result_model->s_proto) ); + + rv = result_compare(result1, result2); + free_servent(result1); + free_servent(result2); + if (rv != 0) + break; + } + + if (rv != 0) + break; + + ++counter; + } + + endservent(); + return ((rv == 0) && (errno == 0)) ? T_PASSED : T_FAILED; +} + +static enum __test_result +getservbyport_test2() +{ + struct servent *result_model; + struct servent *result1; + struct servent *result2; + + int rv; + + setservent(1); + while ( (result_model = getservent()) != NULL) { + __test_log2("trying port: %d, proto: %s\n", result_model->s_port, result_model->s_proto); + + result1 = clone_servent( DECORATED(getservbyport)(result_model->s_port, result_model->s_proto) ); + result2 = clone_servent( trivial_getservbyport(result_model->s_port, result_model->s_proto) ); + + rv = result_compare(result1, result2); + free_servent(result1); + free_servent(result2); + if (rv != 0) + break; + } + + endservent(); + return ((rv == 0) && (errno == 0)) ? T_PASSED : T_FAILED; +} + +static enum __test_result +getservbyport_test3() +{ + struct servent *result_model; + struct servent *result1; + struct servent *result2; + + int counter; + int rv; + + counter = 0; + setservent(1); + while ( (result_model = getservent()) != NULL) { + switch (counter % 3) { + case 0: + break; + case 1: + result_model->s_port = ntohs(result_model->s_port); + break; + case 2: + result_model->s_proto[0] = 'b'; + break; + } + __test_log2("trying port: %d, proto: %s\n", result_model->s_port, result_model->s_proto); + + result1 = clone_servent( DECORATED(getservbyport)(result_model->s_port, result_model->s_proto) ); + result2 = clone_servent( trivial_getservbyport(result_model->s_port, result_model->s_proto) ); + + rv = result_compare(result1, result2); + free_servent(result1); + free_servent(result2); + if (rv != 0) + break; + + ++counter; + } + + endservent(); + return ((rv == 0) && (errno == 0)) ? T_PASSED : T_FAILED; +} + +static enum __test_result +servent_stress_test() +{ + const size_t bigsize = 65000; + + char *bigname; + char *bigproto; + + (void)DECORATED(getservbyname)("",""); + (void)DECORATED(getservbyport)(-1,""); + + bigname = (char *)malloc(bigsize); + assert(bigname != NULL); + memset(bigname, 'a', bigsize - 1); + bigname[bigsize - 1] = '\0'; + + bigproto = (char *)malloc(bigsize); + assert(bigproto != NULL); + memset(bigproto, 'b', bigsize - 1); + bigproto[bigsize - 1]='\0'; + + (void)DECORATED(getservbyname)(bigname, bigproto); + (void)DECORATED(getservbyport)(-1, bigproto); + + return T_PASSED; +} + int main(int argc, char *argv[]) { @@ -159,6 +458,26 @@ assert(tinfo != NULL); __register_test_info(tsystem, tinfo); + tinfo = __create_test_info("getservbyname_test2", getservbyname_test2, 1); + assert(tinfo != NULL); + __register_test_info(tsystem, tinfo); + + tinfo = __create_test_info("getservbyport_test2", getservbyport_test2, 1); + assert(tinfo != NULL); + __register_test_info(tsystem, tinfo); + + tinfo = __create_test_info("getservbyname_test3", getservbyname_test3, 1); + assert(tinfo != NULL); + __register_test_info(tsystem, tinfo); + + tinfo = __create_test_info("getservbyport_test3", getservbyport_test3, 1); + assert(tinfo != NULL); + __register_test_info(tsystem, tinfo); + + tinfo = __create_test_info("servent_stress_test", servent_stress_test, 1); + assert(tinfo != NULL); + __register_test_info(tsystem, tinfo); + __process_tests(tsystem, NULL, NULL); __destroy_test_system(tsystem); return 0; From owner-p4-projects@FreeBSD.ORG Thu Jul 14 14:32:05 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 665A416A421; Thu, 14 Jul 2005 14:32:04 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3F42A16A41C for ; Thu, 14 Jul 2005 14:32:04 +0000 (GMT) (envelope-from soc-tyler@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6428343D5D for ; Thu, 14 Jul 2005 14:32:03 +0000 (GMT) (envelope-from soc-tyler@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6EEW3BH083359 for ; Thu, 14 Jul 2005 14:32:03 GMT (envelope-from soc-tyler@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6EEW2Nv083356 for perforce@freebsd.org; Thu, 14 Jul 2005 14:32:02 GMT (envelope-from soc-tyler@freebsd.org) Date: Thu, 14 Jul 2005 14:32:02 GMT Message-Id: <200507141432.j6EEW2Nv083356@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-tyler@freebsd.org using -f From: soc-tyler To: Perforce Change Reviews Cc: Subject: PERFORCE change 80160 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jul 2005 14:32:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=80160 Change 80160 by soc-tyler@soc-tyler_launchd on 2005/07/14 14:31:53 Remove init.c and init.8, substituting for FreeBSD's init.c Add service (shell script) as well. Affected files ... .. //depot/projects/soc2005/launchd/Makefile#4 edit .. //depot/projects/soc2005/launchd/init.8#2 delete .. //depot/projects/soc2005/launchd/init.c#3 delete .. //depot/projects/soc2005/launchd/service#1 add .. //depot/projects/soc2005/launchd/service.8#1 add Differences ... ==== //depot/projects/soc2005/launchd/Makefile#4 (text+ko) ==== @@ -10,5 +10,6 @@ CFLAGS+= -g -Wall -W -Wshadow -Wpadded -Iincludes/ LDADD+= -lutil +NO_SHARED?= YES .include From owner-p4-projects@FreeBSD.ORG Thu Jul 14 14:35:08 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E293D16A420; Thu, 14 Jul 2005 14:35:07 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BBD7C16A41C for ; Thu, 14 Jul 2005 14:35:07 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64CA643D45 for ; Thu, 14 Jul 2005 14:35:07 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6EEZ7iA083477 for ; Thu, 14 Jul 2005 14:35:07 GMT (envelope-from soc-victor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6EEZ7Nv083474 for perforce@freebsd.org; Thu, 14 Jul 2005 14:35:07 GMT (envelope-from soc-victor@freebsd.org) Date: Thu, 14 Jul 2005 14:35:07 GMT Message-Id: <200507141435.j6EEZ7Nv083474@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-victor@freebsd.org using -f From: soc-victor To: Perforce Change Reviews Cc: Subject: PERFORCE change 80161 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jul 2005 14:35:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=80161 Change 80161 by soc-victor@soc-victor_82.76.158.176 on 2005/07/14 14:34:47 First version of the hrStorageTable, containing only swap details (per swap device). Also it contains the persistent map (per agent lifetime) for hrStorageTable index. Next changeset will add some VM data and FS storage info. Affected files ... .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#5 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#4 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#4 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#4 edit Differences ... ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#5 (text+ko) ==== @@ -6,10 +6,11 @@ CONTRIB=${.CURDIR}/../../../../contrib/bsnmp MOD= hostres -SRCS= hostres_snmp.c hostres_scalars.c +SRCS= hostres_snmp.c hostres_scalars.c \ + hostres_storage_tbl.c WARNS?= 6 #Not having NDEBUG defined will enable assertions and a lot of output on stderr -CFLAGS+= -DNDEBUG +#CFLAGS+= -DNDEBUG XSYM= host hrStorageOther hrStorageRam hrStorageVirtualMemory \ hrStorageFixedDisk hrStorageRemovableDisk hrStorageFloppyDisk \ hrStorageCompactDisc hrStorageRamDisk hrStorageFlashMemory \ ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * Host Resource MIB scalars implementation for SNMPd. + * Host Resources MIB scalars implementation for SNMPd. */ #include "hostres_snmp.h" #include "hostres_tree.h" @@ -208,17 +208,17 @@ switch (value->var.subs[sub - 1]) { case LEAF_hrSystemDate: { if ( string_save(value, ctx, 8, - &hostres_ctx_g.time_to_set ) == SNMP_ERR_NOERROR + &hrState_g.time_to_set ) == SNMP_ERR_NOERROR || string_save(value, ctx, 11, - &hostres_ctx_g.time_to_set ) == SNMP_ERR_NOERROR + &hrState_g.time_to_set ) == SNMP_ERR_NOERROR ) { - if( OS_checkSystemDateInput( hostres_ctx_g.time_to_set, - &hostres_ctx_g.timeval_to_set) != 0 ) { + if( OS_checkSystemDateInput( hrState_g.time_to_set, + &hrState_g.timeval_to_set) != 0 ) { HR_DPRINTF((stderr, "Parse for '%s' failed as DateAndTime \n", - hostres_ctx_g.time_to_set)); + hrState_g.time_to_set)); return (SNMP_ERR_GENERR); } } @@ -239,9 +239,9 @@ switch (value->var.subs[sub - 1]) { case LEAF_hrSystemDate: { HR_DPRINTF((stderr, "SNMP_OP_ROLLBACK for LEAF_hrSystemDate\n")); - string_rollback(ctx, &hostres_ctx_g.time_to_set); - hostres_ctx_g.timeval_to_set.tv_sec = 0; - hostres_ctx_g.timeval_to_set.tv_usec = 0; + string_rollback(ctx, &hrState_g.time_to_set); + hrState_g.timeval_to_set.tv_sec = 0; + hrState_g.timeval_to_set.tv_usec = 0; return (SNMP_ERR_NOERROR); } @@ -261,7 +261,7 @@ HR_DPRINTF((stderr, "SNMP_OP_COMMIT for LEAF_hrSystemDate\n")); string_commit(ctx); - if( OS_setSystemDate(&hostres_ctx_g.timeval_to_set) != 0 ) { + if( OS_setSystemDate(&hrState_g.timeval_to_set) != 0 ) { HR_DPRINTF((stderr, "SNMP_OP_COMMIT FAILEDfor LEAF_hrSystemDate\n")); return (SNMP_ERR_GENERR); @@ -346,7 +346,7 @@ struct timeval right_now = {0,0}; - if( hostres_ctx_g.kernel_boot == 0 ) { + if( hrState_g.kernel_boot == 0 ) { /*first time, do the sysctl*/ @@ -363,7 +363,7 @@ kernel_boot_timestamp.tv_sec, kernel_boot_timestamp.tv_usec)); - hostres_ctx_g.kernel_boot = (kernel_boot_timestamp.tv_sec * 100) + + hrState_g.kernel_boot = (kernel_boot_timestamp.tv_sec * 100) + (kernel_boot_timestamp.tv_usec / 10000); } @@ -374,7 +374,7 @@ return ( (right_now.tv_sec * 100) + (right_now.tv_usec / 10000) - - hostres_ctx_g. kernel_boot ); + hrState_g. kernel_boot ); @@ -427,7 +427,7 @@ OS_getSystemInitialLoadParameters(void){ - if( strlen(hostres_ctx_g.k_boot_line) == 0) { + if( strlen(hrState_g.k_boot_line) == 0) { int mib[2]={ CTL_KERN, KERN_BOOTFILE }; char *buf = NULL; size_t buf_len = 0; @@ -447,11 +447,11 @@ return (NULL); /*error*/ } - (void)strncpy(hostres_ctx_g.k_boot_line, buf, 127); - HR_DPRINTF((stderr, "Got kernel boot file: %s\n", hostres_ctx_g.k_boot_line)); + (void)strncpy(hrState_g.k_boot_line, buf, 127); + HR_DPRINTF((stderr, "Got kernel boot file: %s\n", hrState_g.k_boot_line)); free(buf); } - return ((u_char*)&hostres_ctx_g.k_boot_line[0]); + return ((u_char*)&hrState_g.k_boot_line[0]); } @@ -460,14 +460,14 @@ int user_counter = 0; struct utmp utmp_entry; struct passwd *pw; - if( hostres_ctx_g.utmp_fp == (FILE*)NULL ) { + if( hrState_g.utmp_fp == (FILE*)NULL ) { assert(0); return (-1); /*error*/ } /*start with the begining of the utmp file*/ - rewind(hostres_ctx_g.utmp_fp); + rewind(hrState_g.utmp_fp); - while (fread(&utmp_entry, sizeof(utmp_entry), 1, hostres_ctx_g.utmp_fp) == 1 ) { + while (fread(&utmp_entry, sizeof(utmp_entry), 1, hrState_g.utmp_fp) == 1 ) { if (utmp_entry.ut_name[0] && utmp_entry.ut_line[0]) { if( (pw = getpwnam(utmp_entry.ut_name)) == NULL ) { continue; @@ -482,12 +482,12 @@ int OS_getSystemProcesses(void) { int proc_count = 0; - if( hostres_ctx_g.kd == (kvm_t*)NULL ) { + if( hrState_g.kd == (kvm_t*)NULL ) { assert(0); return (-1); /*error*/ } - if( kvm_getprocs(hostres_ctx_g.kd, KERN_PROC_PROC, 0, &proc_count) == NULL ) { + if( kvm_getprocs(hrState_g.kd, KERN_PROC_PROC, 0, &proc_count) == NULL ) { syslog(LOG_ERR, "kvm_getprocs failed: %m "); return (-1);/*error*/ } @@ -496,34 +496,34 @@ int OS_getSystemMaxProcesses(void) { - if( hostres_ctx_g.max_proc == 0 ) { + if( hrState_g.max_proc == 0 ) { int mib[2] = {CTL_KERN, KERN_MAXPROC}; size_t len = 0; - len = sizeof(hostres_ctx_g.max_proc); - if(sysctl(mib, 2, &hostres_ctx_g.max_proc, &len, NULL, 0) == -1) { + len = sizeof(hrState_g.max_proc); + if(sysctl(mib, 2, &hrState_g.max_proc, &len, NULL, 0) == -1) { syslog(LOG_ERR, "sysctl KERN_MAXPROC failed: %m "); return (-1); /*error*/ } - HR_DPRINTF((stderr, "Got kernel maxporc: %d\n",hostres_ctx_g.max_proc)); + HR_DPRINTF((stderr, "Got kernel maxporc: %d\n",hrState_g.max_proc)); } - return (hostres_ctx_g.max_proc); + return (hrState_g.max_proc); } uint32_t OS_getMemorySize(void) { - if(hostres_ctx_g.phys_mem_size == 0) { + if(hrState_g.phys_mem_size == 0) { int mib[2] = { CTL_HW, HW_PHYSMEM }; - size_t len = sizeof(hostres_ctx_g.phys_mem_size); - if (sysctl(mib, 2, &hostres_ctx_g.phys_mem_size, &len, NULL, 0) == -1) { + size_t len = sizeof(hrState_g.phys_mem_size); + if (sysctl(mib, 2, &hrState_g.phys_mem_size, &len, NULL, 0) == -1) { syslog(LOG_ERR, "sysctl({ CTL_HW, HW_PHYSMEM }) failed: %m "); return 0; /*error*/ } - hostres_ctx_g.phys_mem_size = hostres_ctx_g.phys_mem_size / 1024; + hrState_g.phys_mem_size = hrState_g.phys_mem_size / 1024; } - return (hostres_ctx_g.phys_mem_size); + return (hrState_g.phys_mem_size); } ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * Host Resource MIB implementation for SNMPd. + * Host Resources MIB implementation for SNMPd. */ #include "hostres_snmp.h" #include "hostres_oid.h" @@ -36,7 +36,9 @@ #include #include #include +#include + /*internal id got after we'll register this module with the agent */ static u_int host_registration_id = 0; @@ -49,7 +51,7 @@ const struct asn_oid oid_host = OIDX_host; /*see the generated file hostres_oid.h*/ -hostres_ctx_type hostres_ctx_g; +struct hostres_state hrState_g; /* HOST RESOURCES mib module initialization hook. @@ -60,24 +62,24 @@ hostres_module = mod; - hostres_ctx_g.utmp_fp = (FILE*)NULL; - hostres_ctx_g.kd = (kvm_t*)NULL; - hostres_ctx_g.kernel_boot = 0; + hrState_g.utmp_fp = (FILE*)NULL; + hrState_g.kd = (kvm_t*)NULL; + hrState_g.kernel_boot = 0; - memset(&hostres_ctx_g.k_boot_line[0], + memset(&hrState_g.k_boot_line[0], '\0', - sizeof(hostres_ctx_g.k_boot_line)); + sizeof(hrState_g.k_boot_line)); - hostres_ctx_g.max_proc = 0; + hrState_g.max_proc = 0; - hostres_ctx_g.phys_mem_size = 0; + hrState_g.phys_mem_size = 0; - if( ( hostres_ctx_g.utmp_fp = fopen(_PATH_UTMP, "r") ) == (FILE*)NULL) { + if( ( hrState_g.utmp_fp = fopen(_PATH_UTMP, "r") ) == (FILE*)NULL) { syslog(LOG_ERR, "fopen(%s) failed: %m ", (const char*)_PATH_UTMP); return (-1); /*error*/ } - if( ( hostres_ctx_g.kd = + if( ( hrState_g.kd = kvm_open(NULL, _PATH_DEVNULL, NULL, O_RDONLY, "kvm_open")) == (kvm_t*)NULL ) { syslog(LOG_ERR, "kvm_open failed: %m "); @@ -85,7 +87,12 @@ } + hrState_g.hr_tick = 0; + + init_hrStorage_tbl_v(); + HR_DPRINTF((stderr, "[%s] done.\n", __func__)); + return (0); } @@ -98,32 +105,34 @@ int hostres_fini(void) { /* here I free the resources used by this module*/ - if( hostres_ctx_g.utmp_fp != (FILE*)NULL ) { - if( fclose(hostres_ctx_g.utmp_fp) != 0 ) { + if( hrState_g.utmp_fp != (FILE*)NULL ) { + if( fclose(hrState_g.utmp_fp) != 0 ) { syslog(LOG_ERR, "fclose failed: %m "); return (-1); /*error*/ } - hostres_ctx_g.utmp_fp = (FILE*)NULL; + hrState_g.utmp_fp = (FILE*)NULL; } - if( hostres_ctx_g.kd != (kvm_t*)NULL ) { - if( kvm_close(hostres_ctx_g.kd) != 0 ) { + if( hrState_g.kd != (kvm_t*)NULL ) { + if( kvm_close(hrState_g.kd) != 0 ) { syslog(LOG_ERR, "kvm_close failed: %m "); return (-1); /*error*/ } - hostres_ctx_g.kd = (kvm_t*)NULL; + hrState_g.kd = (kvm_t*)NULL; } - hostres_ctx_g.kernel_boot = 0; + hrState_g.kernel_boot = 0; - memset(&hostres_ctx_g.k_boot_line[0], + memset(&hrState_g.k_boot_line[0], '\0', - sizeof(hostres_ctx_g.k_boot_line)); + sizeof(hrState_g.k_boot_line)); - hostres_ctx_g.max_proc = 0; + hrState_g.max_proc = 0; - hostres_ctx_g.phys_mem_size = 0; - + hrState_g.phys_mem_size = 0; + + fini_hrStorage_tbl_v(); + if( host_registration_id > 0){ or_unregister(host_registration_id); } @@ -137,6 +146,11 @@ */ static void hostres_idle_v(void) { + if ( (time(NULL) - hrState_g.hrStorage_tbl_age) > 7 ) { + HR_DPRINTF((stderr, " %s: need refresh\n ",__func__)); + refresh_hrStorage_tbl_v(); + } + /*nothing iteresting here for the time being*/ HR_DPRINTF((stderr, "[%s] done.\n ", __func__)); } @@ -207,14 +221,6 @@ Next items are not implemented yet. Once one of them is implemented it will be moved into its own C file */ -int op_hrStorageTable(struct snmp_context *ctx __unused, - struct snmp_value *value __unused, - u_int sub __unused, - u_int iidx __unused, - enum snmp_op curr_op __unused) -{ - return (SNMP_ERR_NOSUCHNAME); -} int op_hrDeviceTable(struct snmp_context *ctx __unused, struct snmp_value *value __unused, ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * Host Resource MIB for SNMPd. + * Host Resources MIB for SNMPd. */ #ifndef __HOSTRES_SNMP_H_INCLUDED__ #define __HOSTRES_SNMP_H_INCLUDED__ @@ -38,6 +38,7 @@ #include /*for kvm_open & friends*/ #include #include /*for struct timeval*/ +#include /*for SLIST, TAILQ & friends*/ /*a debug macro*/ @@ -47,10 +48,10 @@ fprintf ARGS; \ } while (0) #else -#define HR_DPRINTF(args) +#define HR_DPRINTF(ARGS) #endif /*NDEBUG*/ -typedef struct hostres_ctx_struct{ +struct hostres_state { FILE *utmp_fp; /*file pointer to keep an open instance of utmp*/ kvm_t *kd; /*kernel descriptor*/ uint32_t kernel_boot; /*boot timestamp in centi-seconds*/ @@ -61,10 +62,79 @@ u_char *time_to_set; /*for setting hrSystemDate*/ struct timeval timeval_to_set; /*for setting hrSystemDate*/ + uint64_t hr_tick; + + struct kvm_swap *swap_devs; /*for kvm_getswapinfo*/ + size_t swap_devs_len; /*idem */ + uint32_t next_hrStorage_index; /*next int availabe for indexing the hrStorageTable*/ + time_t hrStorage_tbl_age; + + + +}; + +/* + * Instance to keep most of the globals related to + * HOST RESOURCES MIB implementation + */ +extern struct hostres_state hrState_g; + +/* + * This structure is used to hold on SNMP table entry + * for HOST-RESOURCES-MIB's hrStorageTable + */ +#define HR_STORAGE_FOUND 0x001 +struct hrStorageTblEntry { + int32_t index; + struct asn_oid type; + u_char descr[255+1]; + int32_t allocationUnits; + int32_t size; + int32_t used; + uint32_t allocationFailures; + uint32_t flags; /*not from the SNMP mib table, only to be used internally*/ + TAILQ_ENTRY(hrStorageTblEntry) link; +}; + + +TAILQ_HEAD(storage_tbl, hrStorageTblEntry); +extern struct storage_tbl storage_tbl; + + +/* + * Next structure is used to keep o list of mappings from a specific + * name (a_name) to an entry in the hrStorageTblEntry; + * We are trying to keep the same index for a specific name at least + * for the duration of one SNMP agent run + */ +struct storageNameMapEntry { + int32_t hrIndex; /*used for hrStorageTblEntry::index*/ + u_char a_name[255+1]; /*map key, also used for hrStorageTblEntry::descr*/ -}hostres_ctx_type; + /*next may be NULL if the respective hrStorageTblEntry is (temporally) gone*/ + struct hrStorageTblEntry *entry_p; + STAILQ_ENTRY(storageNameMapEntry) link; +}; + +STAILQ_HEAD(storage_map_list, storageNameMapEntry); +extern struct storage_map_list storage_name_map; + +/* + * Init the things for hrStorageTable. + */ +void init_hrStorage_tbl_v(void); + +/* + * Finalization routine for hrStorageTable. + * It destroys the lists and frees the heap memory + */ +void fini_hrStorage_tbl_v(void); -extern hostres_ctx_type hostres_ctx_g; +/* + * Refresh routine for hrStorageTable. + * Usable for polling the system for any changes. + */ +void refresh_hrStorage_tbl_v(void); #endif /*__HOSTRES_SNMP_H_INCLUDED__ */ From owner-p4-projects@FreeBSD.ORG Thu Jul 14 14:51:28 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6568C16A420; Thu, 14 Jul 2005 14:51:28 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3CFFD16A41C for ; Thu, 14 Jul 2005 14:51:28 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE86F43D48 for ; Thu, 14 Jul 2005 14:51:27 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6EEpRrG084231 for ; Thu, 14 Jul 2005 14:51:27 GMT (envelope-from soc-victor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6EEpR1k084228 for perforce@freebsd.org; Thu, 14 Jul 2005 14:51:27 GMT (envelope-from soc-victor@freebsd.org) Date: Thu, 14 Jul 2005 14:51:27 GMT Message-Id: <200507141451.j6EEpR1k084228@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-victor@freebsd.org using -f From: soc-victor To: Perforce Change Reviews Cc: Subject: PERFORCE change 80163 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jul 2005 14:51:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=80163 Change 80163 by soc-victor@soc-victor_82.76.158.176 on 2005/07/14 14:51:07 Added a file missing from the changelist #80161 Affected files ... .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jul 14 17:21:52 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8299A16A420; Thu, 14 Jul 2005 17:21:51 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4033B16A41C for ; Thu, 14 Jul 2005 17:21:51 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F38BF43D46 for ; Thu, 14 Jul 2005 17:21:50 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6EHLo3d098397 for ; Thu, 14 Jul 2005 17:21:50 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6EHLoEI098394 for perforce@freebsd.org; Thu, 14 Jul 2005 17:21:50 GMT (envelope-from jhb@freebsd.org) Date: Thu, 14 Jul 2005 17:21:50 GMT Message-Id: <200507141721.j6EHLoEI098394@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 80192 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jul 2005 17:21:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=80192 Change 80192 by jhb@jhb_slimer on 2005/07/14 17:21:42 Merge in the atomic_foo_ptr() changes from the ktrace branch. Affected files ... .. //depot/projects/smpng/sys/alpha/include/atomic.h#26 edit .. //depot/projects/smpng/sys/amd64/include/atomic.h#21 edit .. //depot/projects/smpng/sys/arm/include/atomic.h#14 edit .. //depot/projects/smpng/sys/dev/hatm/if_hatm_intr.c#13 edit .. //depot/projects/smpng/sys/i386/include/atomic.h#40 edit .. //depot/projects/smpng/sys/ia64/include/atomic.h#10 edit .. //depot/projects/smpng/sys/kern/kern_mutex.c#100 edit .. //depot/projects/smpng/sys/kern/kern_shutdown.c#59 edit .. //depot/projects/smpng/sys/powerpc/include/atomic.h#13 edit .. //depot/projects/smpng/sys/sparc64/include/atomic.h#13 edit .. //depot/projects/smpng/sys/sys/mutex.h#58 edit Differences ... ==== //depot/projects/smpng/sys/alpha/include/atomic.h#26 (text+ko) ==== @@ -434,66 +434,23 @@ #define atomic_readandclear_long atomic_readandclear_64 /* Operations on pointers. */ -static __inline int -atomic_cmpset_ptr(volatile void *dst, void *exp, void *src) -{ - - return (atomic_cmpset_long((volatile u_long *)dst, (u_long)exp, - (u_long)src)); -} - -static __inline int -atomic_cmpset_acq_ptr(volatile void *dst, void *exp, void *src) -{ - - return (atomic_cmpset_acq_long((volatile u_long *)dst, (u_long)exp, - (u_long)src)); -} - -static __inline int -atomic_cmpset_rel_ptr(volatile void *dst, void *exp, void *src) -{ - - return (atomic_cmpset_rel_long((volatile u_long *)dst, (u_long)exp, - (u_long)src)); -} - -static __inline void * -atomic_load_acq_ptr(volatile void *p) -{ - return (void *)atomic_load_acq_long((volatile u_long *)p); -} - -static __inline void -atomic_store_rel_ptr(volatile void *p, void *v) -{ - atomic_store_rel_long((volatile u_long *)p, (u_long)v); -} - -#define ATOMIC_PTR(NAME) \ -static __inline void \ -atomic_##NAME##_ptr(volatile void *p, uintptr_t v) \ -{ \ - atomic_##NAME##_long((volatile u_long *)p, v); \ -} \ - \ -static __inline void \ -atomic_##NAME##_acq_ptr(volatile void *p, uintptr_t v) \ -{ \ - atomic_##NAME##_acq_long((volatile u_long *)p, v);\ -} \ - \ -static __inline void \ -atomic_##NAME##_rel_ptr(volatile void *p, uintptr_t v) \ -{ \ - atomic_##NAME##_rel_long((volatile u_long *)p, v);\ -} - -ATOMIC_PTR(set) -ATOMIC_PTR(clear) -ATOMIC_PTR(add) -ATOMIC_PTR(subtract) - -#undef ATOMIC_PTR +#define atomic_set_ptr atomic_set_64 +#define atomic_set_acq_ptr atomic_set_acq_64 +#define atomic_set_rel_ptr atomic_set_rel_64 +#define atomic_clear_ptr atomic_clear_64 +#define atomic_clear_acq_ptr atomic_clear_acq_64 +#define atomic_clear_rel_ptr atomic_clear_rel_64 +#define atomic_add_ptr atomic_add_64 +#define atomic_add_acq_ptr atomic_add_acq_64 +#define atomic_add_rel_ptr atomic_add_rel_64 +#define atomic_subtract_ptr atomic_subtract_64 +#define atomic_subtract_acq_ptr atomic_subtract_acq_64 +#define atomic_subtract_rel_ptr atomic_subtract_rel_64 +#define atomic_cmpset_ptr atomic_cmpset_64 +#define atomic_cmpset_acq_ptr atomic_cmpset_acq_64 +#define atomic_cmpset_rel_ptr atomic_cmpset_rel_64 +#define atomic_load_acq_ptr atomic_load_acq_64 +#define atomic_store_rel_ptr atomic_store_rel_64 +#define atomic_readandclear_ptr atomic_readandclear_64 #endif /* ! _MACHINE_ATOMIC_H_ */ ==== //depot/projects/smpng/sys/amd64/include/atomic.h#21 (text+ko) ==== @@ -292,9 +292,6 @@ #define atomic_cmpset_acq_long atomic_cmpset_long #define atomic_cmpset_rel_long atomic_cmpset_long -#define atomic_cmpset_acq_ptr atomic_cmpset_ptr -#define atomic_cmpset_rel_ptr atomic_cmpset_ptr - /* Operations on 8-bit bytes. */ #define atomic_set_8 atomic_set_char #define atomic_set_acq_8 atomic_set_acq_char @@ -348,55 +345,24 @@ #define atomic_readandclear_32 atomic_readandclear_int /* Operations on pointers. */ -static __inline int -atomic_cmpset_ptr(volatile void *dst, void *exp, void *src) -{ - - return (atomic_cmpset_long((volatile u_long *)dst, - (u_long)exp, (u_long)src)); -} - -static __inline void * -atomic_load_acq_ptr(volatile void *p) -{ - /* - * The apparently-bogus cast to intptr_t in the following is to - * avoid a warning from "gcc -Wbad-function-cast". - */ - return ((void *)(intptr_t)atomic_load_acq_long((volatile u_long *)p)); -} - -static __inline void -atomic_store_rel_ptr(volatile void *p, void *v) -{ - atomic_store_rel_long((volatile u_long *)p, (u_long)v); -} - -#define ATOMIC_PTR(NAME) \ -static __inline void \ -atomic_##NAME##_ptr(volatile void *p, uintptr_t v) \ -{ \ - atomic_##NAME##_long((volatile u_long *)p, v); \ -} \ - \ -static __inline void \ -atomic_##NAME##_acq_ptr(volatile void *p, uintptr_t v) \ -{ \ - atomic_##NAME##_acq_long((volatile u_long *)p, v);\ -} \ - \ -static __inline void \ -atomic_##NAME##_rel_ptr(volatile void *p, uintptr_t v) \ -{ \ - atomic_##NAME##_rel_long((volatile u_long *)p, v);\ -} - -ATOMIC_PTR(set) -ATOMIC_PTR(clear) -ATOMIC_PTR(add) -ATOMIC_PTR(subtract) - -#undef ATOMIC_PTR +#define atomic_set_ptr atomic_set_long +#define atomic_set_acq_ptr atomic_set_acq_long +#define atomic_set_rel_ptr atomic_set_rel_long +#define atomic_clear_ptr atomic_clear_long +#define atomic_clear_acq_ptr atomic_clear_acq_long +#define atomic_clear_rel_ptr atomic_clear_rel_long +#define atomic_add_ptr atomic_add_long +#define atomic_add_acq_ptr atomic_add_acq_long +#define atomic_add_rel_ptr atomic_add_rel_long +#define atomic_subtract_ptr atomic_subtract_long +#define atomic_subtract_acq_ptr atomic_subtract_acq_long +#define atomic_subtract_rel_ptr atomic_subtract_rel_long +#define atomic_load_acq_ptr atomic_load_acq_long +#define atomic_store_rel_ptr atomic_store_rel_long +#define atomic_cmpset_ptr atomic_cmpset_long +#define atomic_cmpset_acq_ptr atomic_cmpset_acq_long +#define atomic_cmpset_rel_ptr atomic_cmpset_rel_long +#define atomic_readandclear_ptr atomic_readandclear_long #endif /* !defined(WANT_FUNCTIONS) */ #endif /* ! _MACHINE_ATOMIC_H_ */ ==== //depot/projects/smpng/sys/arm/include/atomic.h#14 (text+ko) ==== @@ -285,13 +285,9 @@ #define atomic_cmpset_rel_32 atomic_cmpset_32 #define atomic_cmpset_rel_ptr atomic_cmpset_ptr #define atomic_load_acq_int atomic_load_32 -#define atomic_clear_ptr(ptr, bit) atomic_clear_32( \ - (volatile uint32_t *)ptr, (uint32_t)bit) -#define atomic_store_ptr(ptr, bit) atomic_store_32( \ - (volatile uint32_t *)ptr, (uint32_t)bit) -#define atomic_cmpset_ptr(dst, exp, s) atomic_cmpset_32( \ - (volatile uint32_t *)dst, (uint32_t)exp, (uint32_t)s) -#define atomic_set_ptr(ptr, src) atomic_set_32( \ - (volatile uint32_t *)ptr, (uint32_t)src) +#define atomic_clear_ptr atomic_clear_32 +#define atomic_store_ptr atomic_store_32 +#define atomic_cmpset_ptr atomic_cmpset_32 +#define atomic_set_ptr atomic_set_32 #endif /* _MACHINE_ATOMIC_H_ */ ==== //depot/projects/smpng/sys/dev/hatm/if_hatm_intr.c#13 (text+ko) ==== @@ -115,7 +115,8 @@ { for (;;) { buf->link = *list; - if (atomic_cmpset_ptr(list, buf->link, buf)) + if (atomic_cmpset_ptr((uintptr_t *)list, (uintptr_t)buf->link, + (uintptr_t)buf)) break; } } @@ -128,7 +129,8 @@ for (;;) { if ((buf = sc->mbuf_list[g]) == NULL) break; - if (atomic_cmpset_ptr(&sc->mbuf_list[g], buf, buf->link)) + if (atomic_cmpset_ptr((uintptr_t *)&sc->mbuf_list[g], + (uintptr_t)buf, (uintptr_t)buf->link)) break; } if (buf == NULL) { @@ -136,7 +138,8 @@ for (;;) { if ((buf = sc->mbuf_list[g]) == NULL) break; - if (atomic_cmpset_ptr(&sc->mbuf_list[g], buf, buf->link)) + if (atomic_cmpset_ptr((uintptr_t *)&sc->mbuf_list[g], + (uintptr_t)buf, (uintptr_t)buf->link)) break; } } ==== //depot/projects/smpng/sys/i386/include/atomic.h#40 (text+ko) ==== @@ -336,9 +336,6 @@ #define atomic_cmpset_acq_long atomic_cmpset_long #define atomic_cmpset_rel_long atomic_cmpset_long -#define atomic_cmpset_acq_ptr atomic_cmpset_ptr -#define atomic_cmpset_rel_ptr atomic_cmpset_ptr - /* Operations on 8-bit bytes. */ #define atomic_set_8 atomic_set_char #define atomic_set_acq_8 atomic_set_acq_char @@ -392,55 +389,24 @@ #define atomic_readandclear_32 atomic_readandclear_int /* Operations on pointers. */ -static __inline int -atomic_cmpset_ptr(volatile void *dst, void *exp, void *src) -{ - - return (atomic_cmpset_int((volatile u_int *)dst, (u_int)exp, - (u_int)src)); -} - -static __inline void * -atomic_load_acq_ptr(volatile void *p) -{ - /* - * The apparently-bogus cast to intptr_t in the following is to - * avoid a warning from "gcc -Wbad-function-cast". - */ - return ((void *)(intptr_t)atomic_load_acq_int((volatile u_int *)p)); -} - -static __inline void -atomic_store_rel_ptr(volatile void *p, void *v) -{ - atomic_store_rel_int((volatile u_int *)p, (u_int)v); -} - -#define ATOMIC_PTR(NAME) \ -static __inline void \ -atomic_##NAME##_ptr(volatile void *p, uintptr_t v) \ -{ \ - atomic_##NAME##_int((volatile u_int *)p, v); \ -} \ - \ -static __inline void \ -atomic_##NAME##_acq_ptr(volatile void *p, uintptr_t v) \ -{ \ - atomic_##NAME##_acq_int((volatile u_int *)p, v);\ -} \ - \ -static __inline void \ -atomic_##NAME##_rel_ptr(volatile void *p, uintptr_t v) \ -{ \ - atomic_##NAME##_rel_int((volatile u_int *)p, v);\ -} - -ATOMIC_PTR(set) -ATOMIC_PTR(clear) -ATOMIC_PTR(add) -ATOMIC_PTR(subtract) - -#undef ATOMIC_PTR +#define atomic_set_ptr atomic_set_int +#define atomic_set_acq_ptr atomic_set_acq_int +#define atomic_set_rel_ptr atomic_set_rel_int +#define atomic_clear_ptr atomic_clear_int +#define atomic_clear_acq_ptr atomic_clear_acq_int +#define atomic_clear_rel_ptr atomic_clear_rel_int +#define atomic_add_ptr atomic_add_int +#define atomic_add_acq_ptr atomic_add_acq_int +#define atomic_add_rel_ptr atomic_add_rel_int +#define atomic_subtract_ptr atomic_subtract_int +#define atomic_subtract_acq_ptr atomic_subtract_acq_int +#define atomic_subtract_rel_ptr atomic_subtract_rel_int +#define atomic_load_acq_ptr atomic_load_acq_int +#define atomic_store_rel_ptr atomic_store_rel_int +#define atomic_cmpset_ptr atomic_cmpset_int +#define atomic_cmpset_acq_ptr atomic_cmpset_acq_int +#define atomic_cmpset_rel_ptr atomic_cmpset_rel_int +#define atomic_readandclear_ptr atomic_readandclear_int #endif /* !defined(WANT_FUNCTIONS) */ #endif /* ! _MACHINE_ATOMIC_H_ */ ==== //depot/projects/smpng/sys/ia64/include/atomic.h#10 (text+ko) ==== @@ -138,6 +138,9 @@ #undef ATOMIC_STORE_LOAD +#define atomic_load_acq_ptr atomic_load_acq_64 +#define atomic_store_rel_ptr atomic_store_rel_64 + #define IA64_ATOMIC(sz, type, name, width, op) \ static __inline type \ atomic_##name##_acq_##width(volatile type *p, type v) \ @@ -255,6 +258,19 @@ #define atomic_add_rel_long atomic_add_rel_64 #define atomic_subtract_rel_long atomic_subtract_rel_64 +#define atomic_set_ptr atomic_set_64 +#define atomic_clear_ptr atomic_clear_64 +#define atomic_add_ptr atomic_add_64 +#define atomic_subtract_ptr atomic_subtract_64 +#define atomic_set_acq_ptr atomic_set_acq_64 +#define atomic_clear_acq_ptr atomic_clear_acq_64 +#define atomic_add_acq_ptr atomic_add_acq_64 +#define atomic_subtract_acq_ptr atomic_subtract_acq_64 +#define atomic_set_rel_ptr atomic_set_rel_64 +#define atomic_clear_rel_ptr atomic_clear_rel_64 +#define atomic_add_rel_ptr atomic_add_rel_64 +#define atomic_subtract_rel_ptr atomic_subtract_rel_64 + #undef IA64_CMPXCHG /* @@ -295,68 +311,13 @@ #define atomic_cmpset_64 atomic_cmpset_acq_64 #define atomic_cmpset_int atomic_cmpset_32 #define atomic_cmpset_long atomic_cmpset_64 +#define atomic_cmpset_ptr atomic_cmpset_64 #define atomic_cmpset_acq_int atomic_cmpset_acq_32 #define atomic_cmpset_rel_int atomic_cmpset_rel_32 #define atomic_cmpset_acq_long atomic_cmpset_acq_64 #define atomic_cmpset_rel_long atomic_cmpset_rel_64 - -static __inline int -atomic_cmpset_acq_ptr(volatile void *dst, void *exp, void *src) -{ - int ret; - ret = atomic_cmpset_acq_long((volatile u_long *)dst, (u_long)exp, - (u_long)src); - return (ret); -} - -static __inline int -atomic_cmpset_rel_ptr(volatile void *dst, void *exp, void *src) -{ - int ret; - ret = atomic_cmpset_rel_long((volatile u_long *)dst, (u_long)exp, - (u_long)src); - return (ret); -} - -#define atomic_cmpset_ptr atomic_cmpset_acq_ptr - -static __inline void * -atomic_load_acq_ptr(volatile void *p) -{ - return ((void *)atomic_load_acq_long((volatile u_long *)p)); -} - -static __inline void -atomic_store_rel_ptr(volatile void *p, void *v) -{ - atomic_store_rel_long((volatile u_long *)p, (u_long)v); -} - -#define ATOMIC_PTR(NAME) \ - static __inline void \ - atomic_##NAME##_ptr(volatile void *p, uintptr_t v) \ - { \ - atomic_##NAME##_long((volatile u_long *)p, v); \ - } \ - \ - static __inline void \ - atomic_##NAME##_acq_ptr(volatile void *p, uintptr_t v) \ - { \ - atomic_##NAME##_acq_long((volatile u_long *)p, v); \ - } \ - \ - static __inline void \ - atomic_##NAME##_rel_ptr(volatile void *p, uintptr_t v) \ - { \ - atomic_##NAME##_rel_long((volatile u_long *)p, v); \ - } - -ATOMIC_PTR(set) -ATOMIC_PTR(clear) -ATOMIC_PTR(add) -ATOMIC_PTR(subtract) - -#undef ATOMIC_PTR +#define atomic_cmpset_acq_ptr atomic_cmpset_acq_64 +#define atomic_cmpset_rel_ptr atomic_cmpset_rel_64 static __inline uint32_t atomic_readandclear_32(volatile uint32_t* p) ==== //depot/projects/smpng/sys/kern/kern_mutex.c#100 (text+ko) ==== @@ -417,7 +417,7 @@ atomic_set_ptr(&m->mtx_lock, MTX_RECURSED); rval = 1; } else - rval = _obtain_lock(m, curthread); + rval = _obtain_lock(m, (uintptr_t)curthread); LOCK_LOG_TRY("LOCK", &m->mtx_object, opts, rval, file, line); if (rval) @@ -434,7 +434,7 @@ * sleep waiting for it), or if we need to recurse on it. */ void -_mtx_lock_sleep(struct mtx *m, struct thread *td, int opts, const char *file, +_mtx_lock_sleep(struct mtx *m, uintptr_t tid, int opts, const char *file, int line) { #if defined(SMP) && !defined(NO_ADAPTIVE_MUTEXES) @@ -467,7 +467,7 @@ #ifdef MUTEX_PROFILING contested = 0; #endif - while (!_obtain_lock(m, td)) { + while (!_obtain_lock(m, tid)) { #ifdef MUTEX_PROFILING contested = 1; atomic_add_int(&m->mtx_contest_holding, 1); @@ -495,7 +495,7 @@ * necessary. */ if (v == MTX_CONTESTED) { - m->mtx_lock = (uintptr_t)td | MTX_CONTESTED; + m->mtx_lock = tid | MTX_CONTESTED; turnstile_claim(&m->mtx_object); break; } @@ -507,8 +507,7 @@ * or the state of the MTX_RECURSED bit changed. */ if ((v & MTX_CONTESTED) == 0 && - !atomic_cmpset_ptr(&m->mtx_lock, (void *)v, - (void *)(v | MTX_CONTESTED))) { + !atomic_cmpset_ptr(&m->mtx_lock, v, v | MTX_CONTESTED)) { turnstile_release(&m->mtx_object); cpu_spinwait(); continue; @@ -542,7 +541,7 @@ if (!cont_logged) { CTR6(KTR_CONTENTION, "contention: %p at %s:%d wants %s, taken by %s:%d", - td, file, line, m->mtx_object.lo_name, + (void *)tid, file, line, m->mtx_object.lo_name, WITNESS_FILE(&m->mtx_object), WITNESS_LINE(&m->mtx_object)); cont_logged = 1; @@ -559,7 +558,7 @@ if (cont_logged) { CTR4(KTR_CONTENTION, "contention end: %s acquired by %p at %s:%d", - m->mtx_object.lo_name, td, file, line); + m->mtx_object.lo_name, (void *)tid, file, line); } #endif #ifdef MUTEX_PROFILING @@ -578,7 +577,7 @@ * is handled inline. */ void -_mtx_lock_spin(struct mtx *m, struct thread *td, int opts, const char *file, +_mtx_lock_spin(struct mtx *m, uintptr_t tid, int opts, const char *file, int line) { int i = 0; @@ -590,7 +589,7 @@ CTR1(KTR_LOCK, "_mtx_lock_spin: %p spinning", m); for (;;) { - if (_obtain_lock(m, td)) + if (_obtain_lock(m, tid)) break; /* Give interrupts a chance while we spin. */ ==== //depot/projects/smpng/sys/kern/kern_shutdown.c#59 (text+ko) ==== @@ -474,7 +474,7 @@ } #ifdef SMP -static volatile void *panic_thread; +static volatile uintptr_t panic_thread; #endif /* @@ -492,7 +492,7 @@ va_list ap; static char buf[256]; #ifdef SMP - void *tid; + uintptr_t tid; /* * We don't want multiple CPU's to panic at the same time, so we @@ -500,7 +500,7 @@ * panic_thread if we are spinning in case the panic on the first * CPU is canceled. */ - tid = td; + tid = (uintptr_t)td; if (panic_thread != tid) while (atomic_cmpset_ptr(&panic_thread, 0, tid) == 0) while (panic_thread != 0) ==== //depot/projects/smpng/sys/powerpc/include/atomic.h#13 (text+ko) ==== @@ -230,6 +230,11 @@ #define atomic_subtract_long(p, v) atomic_subtract_32((uint32_t *)p, (uint32_t)v) #define atomic_readandclear_long atomic_readandclear_32 +#define atomic_set_ptr atomic_set_32 +#define atomic_clear_ptr atomic_clear_32 +#define atomic_add_ptr atomic_add_32 +#define atomic_subtract_ptr atomic_subtract_32 + #if 0 /* See above. */ @@ -293,6 +298,15 @@ #define atomic_subtract_acq_long atomic_subtract_acq_32 #define atomic_subtract_rel_long atomic_subtract_rel_32 +#define atomic_set_acq_ptr atomic_set_acq_32 +#define atomic_set_rel_ptr atomic_set_rel_32 +#define atomic_clear_acq_ptr atomic_clear_acq_32 +#define atomic_clear_rel_ptr atomic_clear_rel_32 +#define atomic_add_acq_ptr atomic_add_acq_32 +#define atomic_add_rel_ptr atomic_add_rel_32 +#define atomic_subtract_acq_ptr atomic_subtract_acq_32 +#define atomic_subtract_rel_ptr atomic_subtract_rel_32 + #undef ATOMIC_ACQ_REL /* @@ -340,6 +354,9 @@ #define atomic_load_acq_long atomic_load_acq_32 #define atomic_store_rel_long atomic_store_rel_32 +#define atomic_load_acq_ptr atomic_load_acq_32 +#define atomic_store_rel_ptr atomic_store_rel_32 + #undef ATOMIC_STORE_LOAD /* @@ -397,19 +414,12 @@ #define atomic_cmpset_int atomic_cmpset_32 #define atomic_cmpset_long atomic_cmpset_32 +#define atomic_cmpset_ptr atomic_cmpset_32 #if 0 #define atomic_cmpset_long_long atomic_cmpset_64 #endif /* 0 */ -static __inline int -atomic_cmpset_ptr(volatile void *dst, void *exp, void *src) -{ - - return (atomic_cmpset_32((volatile uint32_t *)dst, (uint32_t)exp, - (uint32_t)src)); -} - static __inline uint32_t atomic_cmpset_acq_32(volatile uint32_t *p, uint32_t cmpval, uint32_t newval) { @@ -431,60 +441,7 @@ #define atomic_cmpset_rel_int atomic_cmpset_rel_32 #define atomic_cmpset_acq_long atomic_cmpset_acq_32 #define atomic_cmpset_rel_long atomic_cmpset_rel_32 - -static __inline int -atomic_cmpset_acq_ptr(volatile void *dst, void *exp, void *src) -{ +#define atomic_cmpset_acq_ptr atomic_cmpset_acq_32 +#define atomic_cmpset_rel_ptr atomic_cmpset_rel_32 - return (atomic_cmpset_acq_32((volatile uint32_t *)dst, - (uint32_t)exp, (uint32_t)src)); -} - -static __inline int -atomic_cmpset_rel_ptr(volatile void *dst, void *exp, void *src) -{ - - return (atomic_cmpset_rel_32((volatile uint32_t *)dst, - (uint32_t)exp, (uint32_t)src)); -} - -static __inline void * -atomic_load_acq_ptr(volatile void *p) -{ - - return (void *)atomic_load_acq_32((volatile uint32_t *)p); -} - -static __inline void -atomic_store_rel_ptr(volatile void *p, void *v) -{ - - atomic_store_rel_32((volatile uint32_t *)p, (uint32_t)v); -} - -#define ATOMIC_PTR(NAME) \ -static __inline void \ -atomic_##NAME##_ptr(volatile void *p, uintptr_t v) \ -{ \ - atomic_##NAME##_32((volatile uint32_t *)p, v); \ -} \ - \ -static __inline void \ -atomic_##NAME##_acq_ptr(volatile void *p, uintptr_t v) \ -{ \ - atomic_##NAME##_acq_32((volatile uint32_t *)p, v); \ -} \ - \ -static __inline void \ -atomic_##NAME##_rel_ptr(volatile void *p, uintptr_t v) \ -{ \ - atomic_##NAME##_rel_32((volatile uint32_t *)p, v); \ -} - -ATOMIC_PTR(set) -ATOMIC_PTR(clear) -ATOMIC_PTR(add) -ATOMIC_PTR(subtract) - -#undef ATOMIC_PTR #endif /* ! _MACHINE_ATOMIC_H_ */ ==== //depot/projects/smpng/sys/sparc64/include/atomic.h#13 (text+ko) ==== @@ -275,7 +275,7 @@ ATOMIC_GEN(long, u_long *, u_long, u_long, 64); ATOMIC_GEN(64, uint64_t *, uint64_t, uint64_t, 64); -ATOMIC_GEN(ptr, void *, void *, uintptr_t, 64); +ATOMIC_GEN(ptr, uintptr_t *, uintptr_t, uintptr_t, 64); #undef ATOMIC_GEN #undef atomic_cas ==== //depot/projects/smpng/sys/sys/mutex.h#58 (text+ko) ==== @@ -100,11 +100,11 @@ void mtx_destroy(struct mtx *m); void mtx_sysinit(void *arg); void mutex_init(void); -void _mtx_lock_sleep(struct mtx *m, struct thread *td, int opts, +void _mtx_lock_sleep(struct mtx *m, uintptr_t tid, int opts, const char *file, int line); void _mtx_unlock_sleep(struct mtx *m, int opts, const char *file, int line); #ifdef SMP -void _mtx_lock_spin(struct mtx *m, struct thread *td, int opts, +void _mtx_lock_spin(struct mtx *m, uintptr_t tid, int opts, const char *file, int line); #endif void _mtx_unlock_spin(struct mtx *m, int opts, const char *file, int line); @@ -127,19 +127,19 @@ /* Try to obtain mtx_lock once. */ #ifndef _obtain_lock #define _obtain_lock(mp, tid) \ - atomic_cmpset_acq_ptr(&(mp)->mtx_lock, (void *)MTX_UNOWNED, (tid)) + atomic_cmpset_acq_ptr(&(mp)->mtx_lock, MTX_UNOWNED, (tid)) #endif /* Try to release mtx_lock if it is unrecursed and uncontested. */ #ifndef _release_lock #define _release_lock(mp, tid) \ - atomic_cmpset_rel_ptr(&(mp)->mtx_lock, (tid), (void *)MTX_UNOWNED) + atomic_cmpset_rel_ptr(&(mp)->mtx_lock, (tid), MTX_UNOWNED) #endif /* Release mtx_lock quickly, assuming we own it. */ #ifndef _release_lock_quick #define _release_lock_quick(mp) \ - atomic_store_rel_ptr(&(mp)->mtx_lock, (void *)MTX_UNOWNED) + atomic_store_rel_ptr(&(mp)->mtx_lock, MTX_UNOWNED) #endif /* @@ -148,7 +148,7 @@ */ #ifndef _get_sleep_lock #define _get_sleep_lock(mp, tid, opts, file, line) do { \ - struct thread *_tid = (tid); \ + uintptr_t _tid = (uintptr_t)(tid); \ \ if (!_obtain_lock((mp), _tid)) \ _mtx_lock_sleep((mp), _tid, (opts), (file), (line)); \ @@ -165,11 +165,11 @@ #ifndef _get_spin_lock #ifdef SMP #define _get_spin_lock(mp, tid, opts, file, line) do { \ - struct thread *_tid = (tid); \ + uintptr_t _tid = (uintptr_t)(tid); \ \ spinlock_enter(); \ if (!_obtain_lock((mp), _tid)) { \ - if ((mp)->mtx_lock == (uintptr_t)_tid) \ + if ((mp)->mtx_lock == _tid) \ (mp)->mtx_recurse++; \ else \ _mtx_lock_spin((mp), _tid, (opts), (file), (line)); \ @@ -177,14 +177,14 @@ } while (0) #else /* SMP */ #define _get_spin_lock(mp, tid, opts, file, line) do { \ - struct thread *_tid = (tid); \ + uintptr_t _tid = (uintptr_t)(tid); \ \ spinlock_enter(); \ - if ((mp)->mtx_lock == (uintptr_t)_tid) \ + if ((mp)->mtx_lock == _tid) \ (mp)->mtx_recurse++; \ else { \ KASSERT((mp)->mtx_lock == MTX_UNOWNED, ("corrupt spinlock")); \ - (mp)->mtx_lock = (uintptr_t)_tid; \ + (mp)->mtx_lock = _tid; \ } \ } while (0) #endif /* SMP */ @@ -196,7 +196,9 @@ */ #ifndef _rel_sleep_lock #define _rel_sleep_lock(mp, tid, opts, file, line) do { \ - if (!_release_lock((mp), (tid))) \ + uintptr_t _tid = (uintptr_t)(tid); \ + \ + if (!_release_lock((mp), _tid)) \ _mtx_unlock_sleep((mp), (opts), (file), (line)); \ } while (0) #endif From owner-p4-projects@FreeBSD.ORG Thu Jul 14 18:00:40 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B742616A420; Thu, 14 Jul 2005 18:00:39 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8BEB016A41C for ; Thu, 14 Jul 2005 18:00:39 +0000 (GMT) (envelope-from soc-tyler@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D3B243D49 for ; Thu, 14 Jul 2005 18:00:39 +0000 (GMT) (envelope-from soc-tyler@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6EI0d7u000342 for ; Thu, 14 Jul 2005 18:00:39 GMT (envelope-from soc-tyler@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6EI0cIH000329 for perforce@freebsd.org; Thu, 14 Jul 2005 18:00:38 GMT (envelope-from soc-tyler@freebsd.org) Date: Thu, 14 Jul 2005 18:00:38 GMT Message-Id: <200507141800.j6EI0cIH000329@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-tyler@freebsd.org using -f From: soc-tyler To: Perforce Change Reviews Cc: Subject: PERFORCE change 80195 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jul 2005 18:00:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=80195 Change 80195 by soc-tyler@soc-tyler_launchd on 2005/07/14 17:59:44 Restart from scratch with launchd.c, start #ifdef'ing Darwin specific nonsense out here and there. Add a few comments from zarzycki@'s explaination of pid1_magic_init() Affected files ... .. //depot/projects/soc2005/launchd/includes/launchd.h#3 edit .. //depot/projects/soc2005/launchd/launchd.c#3 edit Differences ... ==== //depot/projects/soc2005/launchd/includes/launchd.h#3 (text+ko) ==== @@ -28,8 +28,9 @@ typedef void (*kq_callback)(void *, struct kevent *); extern kq_callback kqsimple_zombie_reaper; -/* Mac OS/NeXT specific */ -//extern mach_port_t launchd_bootstrap_port; +#ifdef _BUILD_MACOS +extern mach_port_t launchd_bootstrap_port; +#endif extern sigset_t blocked_signals; #ifdef PID1_REAP_ADOPTED_CHILDREN @@ -47,4 +48,9 @@ void catatonia(void); void death(void); +// on Darwin-based systems, LOG_LAUNCHD is defined for syslog() +#ifndef _BUILD_MACOS +#define LOG_LAUNCHD LOG_DAEMON +#endif + #endif ==== //depot/projects/soc2005/launchd/launchd.c#3 (text+ko) ==== @@ -47,10 +47,8 @@ * * @APPLE_LICENSE_HEADER_END@ */ - -/* Mac OS specific frameworks (and NeXT-specific for that matter) - * XXX: these need to be implemented or worked around in another manner --------------------------------------------------------------------------------- + +#ifdef _BUILD_MACOS #include #include #include @@ -58,26 +56,26 @@ #include #include #endif --------------------------------------------------------------------------------- - */ +#endif + #include #include #include #include -/* sys/param.h defines NGROUPS which is necessary for sys/ucred.h */ #include #include #include #include #include #include +#include #include -#include #include #include #include #include #include +#include #include #include #include @@ -90,6 +88,7 @@ #include #include #include +#include #include #include #include @@ -101,21 +100,21 @@ #include "launch_priv.h" #include "launchd.h" -/* Another mach/Mac OS specific header that's been stripped out for FreeBSD - * related work, similar items on FreeBSD might be related to init(8) +#ifdef _BUILD_MACOS #include "bootstrap_internal.h" - */ +#endif #define LAUNCHD_MIN_JOB_RUN_TIME 10 #define LAUNCHD_REWARD_JOB_RUN_TIME 60 #define LAUNCHD_FAILED_EXITS_THRESHOLD 10 #define PID1LAUNCHD_CONF "/etc/launchd.conf" #define LAUNCHD_CONF ".launchd.conf" -#define LAUNCHCTL_PATH "/bin/launchctl" -/* Mac OS specific +#define LAUNCHCTL_PATH "/sbin/launchctl" + +#ifdef _BUILD_MACOS #define SECURITY_LIB "/System/Library/Frameworks/Security.framework/Versions/A/Security" #define VOLFSDIR "/.vol" - */ +#endif extern char **environ; @@ -220,18 +219,20 @@ static pid_t readcfg_pid = 0; static bool launchd_inited = false; static bool shutdown_in_progress = false; + +sigset_t blocked_signals; + +#ifdef _BUILD_MACOS static pthread_t mach_server_loop_thread; -/* We undeclared this variable in includes/launchd.h so we will do so here as - * well. (on Darwin, mach_port_t is an unsigned int, it's purpose escapes me.. - * I would assume it's related to mach's bootstrap concept, so I should probably - * hit it as I replace init(8) mach_port_t launchd_bootstrap_port = MACH_PORT_NULL; - */ -sigset_t blocked_signals = 0; +blocked_signals = 0; +#endif + static char *pending_stdout = NULL; static char *pending_stderr = NULL; -int main(int argc, char *argv[]) { +int main(int argc, char *argv[]) +{ static const int sigigns[] = { SIGHUP, SIGINT, SIGPIPE, SIGALRM, SIGTERM, SIGURG, SIGTSTP, SIGTSTP, SIGCONT, /*SIGCHLD,*/ SIGTTIN, SIGTTOU, SIGIO, SIGXCPU, SIGXFSZ, SIGVTALRM, SIGPROF, @@ -318,7 +319,9 @@ if (getpid() == 1) { pid1_magic_init(sflag, vflag, xflag); } else { +#ifdef _BUILD_MACOS launchd_bootstrap_port = bootstrap_port; +#endif launchd_server_init(argv[0] ? true : false); } @@ -403,34 +406,41 @@ if (memsz == 4) mem = *(uint32_t *)&mem; mvn = mem / (64 * 1024) + 1024; + + // Performance note: change the max # of vnodes if (sysctl(mvnmib, 2, NULL, NULL, &mvn, sizeof(mvn)) == -1) syslog(LOG_WARNING, "sysctl(\"%s\"): %m", "kern.maxvnodes"); } + + // Performance note: set our hostname to localhost for now if (sysctl(hnmib, 2, NULL, NULL, "localhost", sizeof("localhost")) == -1) syslog(LOG_WARNING, "sysctl(\"%s\"): %m", "kern.hostname"); if (setlogin("root") == -1) syslog(LOG_ERR, "setlogin(\"root\"): %m"); - + + // Performance note: setup our loopback interface inline loopback_setup(); if (mount("fdesc", "/dev", MNT_UNION, NULL) == -1) syslog(LOG_ERR, "mount(\"%s\", \"%s\", ...): %m", "fdesc", "/dev/"); setenv("PATH", _PATH_STDPATH, 1); - +#ifdef _BUILD_MACOS launchd_bootstrap_port = mach_init_init(); task_set_bootstrap_port(mach_task_self(), launchd_bootstrap_port); bootstrap_port = MACH_PORT_NULL; +#endif pthread_attr_init(&attr); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); - +#ifdef _BUILD_MACOS pthr_r = pthread_create(&mach_server_loop_thread, &attr, mach_server_loop, NULL); if (pthr_r != 0) { syslog(LOG_ERR, "pthread_create(mach_server_loop): %s", strerror(pthr_r)); exit(EXIT_FAILURE); } +#endif pthread_attr_destroy(&attr); @@ -2246,6 +2256,10 @@ return launch_data_new_opaque(l, sizeof(struct rlimit) * RLIM_NLIMITS); } +/* + * XXX: I'm not exactly sure what this function's exact purpose is. + */ +#ifdef _BUILD_MACOS __private_extern__ void launchd_SessionCreate(const char *who) { void *seclib = dlopen(SECURITY_LIB, RTLD_LAZY); @@ -2267,6 +2281,7 @@ syslog(LOG_WARNING, "%s: dlopen(\"%s\",...): %s", who, SECURITY_LIB, dlerror()); } } +#endif static int dir_has_files(const char *path) { From owner-p4-projects@FreeBSD.ORG Thu Jul 14 18:10:52 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80F1216A421; Thu, 14 Jul 2005 18:10:52 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2F80516A41F for ; Thu, 14 Jul 2005 18:10:52 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D7A0E43D45 for ; Thu, 14 Jul 2005 18:10:51 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6EIAp0p000763 for ; Thu, 14 Jul 2005 18:10:51 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6EIApG6000760 for perforce@freebsd.org; Thu, 14 Jul 2005 18:10:51 GMT (envelope-from jhb@freebsd.org) Date: Thu, 14 Jul 2005 18:10:51 GMT Message-Id: <200507141810.j6EIApG6000760@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 80196 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jul 2005 18:10:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=80196 Change 80196 by jhb@jhb_slimer on 2005/07/14 18:09:51 Try to close a race between wait() free'ing the vmspace out from under the last thread that is still trying to exit. Reported by: ps Affected files ... .. //depot/projects/smpng/sys/kern/kern_exit.c#97 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_exit.c#97 (text+ko) ==== @@ -487,6 +487,9 @@ */ cpu_exit(td); + WITNESS_WARN(WARN_PANIC, &proctree_lock.sx_object, + "process (pid %d) exiting", p->p_pid); + PROC_LOCK(p); PROC_LOCK(p->p_pptr); sx_xunlock(&proctree_lock); @@ -495,20 +498,16 @@ * We have to wait until after acquiring all locks before * changing p_state. We need to avoid all possible context * switches (including ones from blocking on a mutex) while - * marked as a zombie. + * marked as a zombie. We also have to set the zombie state + * before we release the parent process' proc lock to avoid + * a lost wakeup. So, we first call wakeup, then we grab the + * sched lock, update the state, and release the parent process' + * proc lock. */ + wakeup(p->p_pptr); mtx_lock_spin(&sched_lock); p->p_state = PRS_ZOMBIE; - - critical_enter(); - mtx_unlock_spin(&sched_lock); - wakeup(p->p_pptr); - PROC_UNLOCK(p->p_pptr); - WITNESS_WARN(WARN_PANIC, &p->p_mtx.mtx_object, - "process (pid %d) exiting", p->p_pid); - mtx_lock_spin(&sched_lock); - critical_exit(); /* Do the same timestamp bookkeeping that mi_switch() would do. */ binuptime(&new_switchtime); @@ -626,6 +625,20 @@ nfound++; if (p->p_state == PRS_ZOMBIE) { + + /* + * It is possible that the last thread of this + * process is still running on another CPU + * in thread_exit() after having dropped the process + * lock via PROC_UNLOCK() but before it has completed + * cpu_throw(). In that case, the other thread must + * still hold sched_lock, so simply by acquiring + * sched_lock once we will wait long enough for the + * thread to exit in that case. + */ + mtx_lock_spin(&sched_lock); + mtx_unlock_spin(&sched_lock); + td->td_retval[0] = p->p_pid; if (status) *status = p->p_xstat; /* convert to int */ From owner-p4-projects@FreeBSD.ORG Thu Jul 14 18:19:03 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E25F516A420; Thu, 14 Jul 2005 18:19:02 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B7BE716A41C for ; Thu, 14 Jul 2005 18:19:02 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A43D43D53 for ; Thu, 14 Jul 2005 18:19:02 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6EIJ2a0001107 for ; Thu, 14 Jul 2005 18:19:02 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6EIJ1lY001104 for perforce@freebsd.org; Thu, 14 Jul 2005 18:19:01 GMT (envelope-from jhb@freebsd.org) Date: Thu, 14 Jul 2005 18:19:01 GMT Message-Id: <200507141819.j6EIJ1lY001104@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 80197 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jul 2005 18:19:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=80197 Change 80197 by jhb@jhb_slimer on 2005/07/14 18:18:25 Happy, happy tabs. Affected files ... .. //depot/projects/smpng/sys/alpha/include/atomic.h#27 edit Differences ... ==== //depot/projects/smpng/sys/alpha/include/atomic.h#27 (text+ko) ==== @@ -434,23 +434,23 @@ #define atomic_readandclear_long atomic_readandclear_64 /* Operations on pointers. */ -#define atomic_set_ptr atomic_set_64 -#define atomic_set_acq_ptr atomic_set_acq_64 -#define atomic_set_rel_ptr atomic_set_rel_64 -#define atomic_clear_ptr atomic_clear_64 -#define atomic_clear_acq_ptr atomic_clear_acq_64 -#define atomic_clear_rel_ptr atomic_clear_rel_64 -#define atomic_add_ptr atomic_add_64 -#define atomic_add_acq_ptr atomic_add_acq_64 -#define atomic_add_rel_ptr atomic_add_rel_64 -#define atomic_subtract_ptr atomic_subtract_64 -#define atomic_subtract_acq_ptr atomic_subtract_acq_64 -#define atomic_subtract_rel_ptr atomic_subtract_rel_64 +#define atomic_set_ptr atomic_set_64 +#define atomic_set_acq_ptr atomic_set_acq_64 +#define atomic_set_rel_ptr atomic_set_rel_64 +#define atomic_clear_ptr atomic_clear_64 +#define atomic_clear_acq_ptr atomic_clear_acq_64 +#define atomic_clear_rel_ptr atomic_clear_rel_64 +#define atomic_add_ptr atomic_add_64 +#define atomic_add_acq_ptr atomic_add_acq_64 +#define atomic_add_rel_ptr atomic_add_rel_64 +#define atomic_subtract_ptr atomic_subtract_64 +#define atomic_subtract_acq_ptr atomic_subtract_acq_64 +#define atomic_subtract_rel_ptr atomic_subtract_rel_64 #define atomic_cmpset_ptr atomic_cmpset_64 #define atomic_cmpset_acq_ptr atomic_cmpset_acq_64 #define atomic_cmpset_rel_ptr atomic_cmpset_rel_64 #define atomic_load_acq_ptr atomic_load_acq_64 #define atomic_store_rel_ptr atomic_store_rel_64 -#define atomic_readandclear_ptr atomic_readandclear_64 +#define atomic_readandclear_ptr atomic_readandclear_64 #endif /* ! _MACHINE_ATOMIC_H_ */ From owner-p4-projects@FreeBSD.ORG Thu Jul 14 19:36:27 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FFC816A420; Thu, 14 Jul 2005 19:36:26 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7511A16A41C; Thu, 14 Jul 2005 19:36:26 +0000 (GMT) (envelope-from julian@elischer.org) Received: from postoffice.vicor-nb.com (postoffice.vicor.com [69.26.56.52]) by mx1.FreeBSD.org (Postfix) with ESMTP id 250C143D46; Thu, 14 Jul 2005 19:36:26 +0000 (GMT) (envelope-from julian@elischer.org) Received: from localhost (localhost [127.0.0.1]) by postoffice.vicor-nb.com (Postfix) with ESMTP id E48344CE7F3; Thu, 14 Jul 2005 12:36:25 -0700 (PDT) Received: from postoffice.vicor-nb.com ([127.0.0.1]) by localhost (postoffice.vicor-nb.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 92251-07; Thu, 14 Jul 2005 12:36:25 -0700 (PDT) Received: from bigwoop.vicor-nb.com (bigwoop.vicor-nb.com [208.206.78.2]) by postoffice.vicor-nb.com (Postfix) with ESMTP id 50E734CE7F2; Thu, 14 Jul 2005 12:36:25 -0700 (PDT) Received: from [208.206.78.97] (julian.vicor-nb.com [208.206.78.97]) by bigwoop.vicor-nb.com (Postfix) with ESMTP id 3FBA27A403; Thu, 14 Jul 2005 12:36:25 -0700 (PDT) Message-ID: <42D6BEB9.6090207@elischer.org> Date: Thu, 14 Jul 2005 12:36:25 -0700 From: Julian Elischer User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.8) Gecko/20050629 X-Accept-Language: en, hu MIME-Version: 1.0 To: John Baldwin References: <200507141810.j6EIApG6000760@repoman.freebsd.org> In-Reply-To: <200507141810.j6EIApG6000760@repoman.freebsd.org> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Scanned: by amavisd-new at postoffice.vicor.com Cc: Perforce Change Reviews Subject: Re: PERFORCE change 80196 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jul 2005 19:36:27 -0000 Ouch! I had though that I had covered that, but maybe it got uncovered in a later revision. John Baldwin wrote: >http://perforce.freebsd.org/chv.cgi?CH=80196 > >Change 80196 by jhb@jhb_slimer on 2005/07/14 18:09:51 > > Try to close a race between wait() free'ing the vmspace out from > under the last thread that is still trying to exit. > > Reported by: ps > >Affected files ... > >.. //depot/projects/smpng/sys/kern/kern_exit.c#97 edit > >Differences ... > >==== //depot/projects/smpng/sys/kern/kern_exit.c#97 (text+ko) ==== > >@@ -487,6 +487,9 @@ > */ > cpu_exit(td); > >+ WITNESS_WARN(WARN_PANIC, &proctree_lock.sx_object, >+ "process (pid %d) exiting", p->p_pid); >+ > PROC_LOCK(p); > PROC_LOCK(p->p_pptr); > sx_xunlock(&proctree_lock); >@@ -495,20 +498,16 @@ > * We have to wait until after acquiring all locks before > * changing p_state. We need to avoid all possible context > * switches (including ones from blocking on a mutex) while >- * marked as a zombie. >+ * marked as a zombie. We also have to set the zombie state >+ * before we release the parent process' proc lock to avoid >+ * a lost wakeup. So, we first call wakeup, then we grab the >+ * sched lock, update the state, and release the parent process' >+ * proc lock. > */ >+ wakeup(p->p_pptr); > mtx_lock_spin(&sched_lock); > p->p_state = PRS_ZOMBIE; >- >- critical_enter(); >- mtx_unlock_spin(&sched_lock); >- wakeup(p->p_pptr); >- > PROC_UNLOCK(p->p_pptr); >- WITNESS_WARN(WARN_PANIC, &p->p_mtx.mtx_object, >- "process (pid %d) exiting", p->p_pid); >- mtx_lock_spin(&sched_lock); >- critical_exit(); > > /* Do the same timestamp bookkeeping that mi_switch() would do. */ > binuptime(&new_switchtime); >@@ -626,6 +625,20 @@ > > nfound++; > if (p->p_state == PRS_ZOMBIE) { >+ >+ /* >+ * It is possible that the last thread of this >+ * process is still running on another CPU >+ * in thread_exit() after having dropped the process >+ * lock via PROC_UNLOCK() but before it has completed >+ * cpu_throw(). In that case, the other thread must >+ * still hold sched_lock, so simply by acquiring >+ * sched_lock once we will wait long enough for the >+ * thread to exit in that case. >+ */ >+ mtx_lock_spin(&sched_lock); >+ mtx_unlock_spin(&sched_lock); >+ > td->td_retval[0] = p->p_pid; > if (status) > *status = p->p_xstat; /* convert to int */ > > From owner-p4-projects@FreeBSD.ORG Fri Jul 15 00:43:02 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E597216A420; Fri, 15 Jul 2005 00:43:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B5E4216A41C for ; Fri, 15 Jul 2005 00:43:01 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A89643D49 for ; Fri, 15 Jul 2005 00:43:00 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6F0h0R1040092 for ; Fri, 15 Jul 2005 00:43:00 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6F0gvt8040089 for perforce@freebsd.org; Fri, 15 Jul 2005 00:42:57 GMT (envelope-from sam@freebsd.org) Date: Fri, 15 Jul 2005 00:42:57 GMT Message-Id: <200507150042.j6F0gvt8040089@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 80219 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2005 00:43:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=80219 Change 80219 by sam@sam_ebb on 2005/07/15 00:42:10 IFC @ 80218 Affected files ... .. //depot/projects/wifi/Makefile#8 integrate .. //depot/projects/wifi/bin/chflags/chflags.1#6 integrate .. //depot/projects/wifi/bin/dd/dd.1#5 integrate .. //depot/projects/wifi/bin/rmail/Makefile#3 integrate .. //depot/projects/wifi/bin/sh/expand.c#2 integrate .. //depot/projects/wifi/bin/sh/sh.1#7 integrate .. //depot/projects/wifi/contrib/amd/amd/amd.8#2 integrate .. //depot/projects/wifi/contrib/amd/amq/amq.8#2 integrate .. //depot/projects/wifi/contrib/amd/amq/pawd.1#2 integrate .. //depot/projects/wifi/contrib/amd/fixmount/fixmount.8#3 integrate .. //depot/projects/wifi/contrib/amd/fsinfo/fsinfo.8#2 integrate .. //depot/projects/wifi/contrib/amd/hlfsd/hlfsd.8#3 integrate .. //depot/projects/wifi/contrib/amd/mk-amd-map/mk-amd-map.8#2 integrate .. //depot/projects/wifi/contrib/amd/scripts/amd.conf.5#2 integrate .. //depot/projects/wifi/contrib/amd/wire-test/wire-test.8#2 integrate .. //depot/projects/wifi/contrib/binutils/opcodes/sparc-opc.c#2 integrate .. //depot/projects/wifi/contrib/bzip2/bzip2.c#3 integrate .. //depot/projects/wifi/contrib/com_err/compile_et.1#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/freebsd.h#2 integrate .. //depot/projects/wifi/contrib/ipfilter/IPFILTER.LICENCE#3 delete .. //depot/projects/wifi/contrib/ipfilter/QNX_OCL.txt#2 delete .. //depot/projects/wifi/contrib/ipfilter/ip_fil_freebsd.c#2 delete .. //depot/projects/wifi/contrib/ipfilter/ip_htable.c#2 delete .. //depot/projects/wifi/contrib/ipfilter/ip_htable.h#2 delete .. //depot/projects/wifi/contrib/ipfilter/ip_irc_pxy.c#2 delete .. //depot/projects/wifi/contrib/ipfilter/ip_lookup.c#2 delete .. //depot/projects/wifi/contrib/ipfilter/ip_lookup.h#2 delete .. //depot/projects/wifi/contrib/ipfilter/ip_pool.c#2 delete .. //depot/projects/wifi/contrib/ipfilter/ip_pool.h#2 delete .. //depot/projects/wifi/contrib/ipfilter/ip_pptp_pxy.c#2 delete .. //depot/projects/wifi/contrib/ipfilter/ip_rpcb_pxy.c#2 delete .. //depot/projects/wifi/contrib/ipfilter/ip_scan.c#2 delete .. //depot/projects/wifi/contrib/ipfilter/ip_scan.h#2 delete .. //depot/projects/wifi/contrib/ipfilter/ip_sync.c#2 delete .. //depot/projects/wifi/contrib/ipfilter/ip_sync.h#2 delete .. //depot/projects/wifi/contrib/ipfilter/lib/ipf_dotuning.c#2 integrate .. //depot/projects/wifi/contrib/isc-dhcp/FREEBSD-upgrade#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/LICENSE#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/Makefile#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/Makefile.conf#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/Makefile.dist#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/README#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/RELNOTES#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/client/Makefile.dist#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/client/clparse.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/client/dhclient-script.8#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/client/dhclient.8#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/client/dhclient.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/client/dhclient.conf#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/client/dhclient.conf.5#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/client/dhclient.leases.5#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/client/scripts/freebsd#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/Makefile.dist#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/alloc.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/bpf.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/comapi.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/conflex.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/ctrace.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/dhcp-eval.5#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/dhcp-options.5#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/discover.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/dispatch.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/dlpi.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/dns.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/ethernet.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/execute.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/fddi.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/icmp.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/inet.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/iscprint.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/lpf.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/memory.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/nit.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/options.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/packet.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/parse.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/print.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/raw.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/resolv.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/socket.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/tables.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/tr.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/tree.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/common/upf.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/configure#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/contrib/3.0b1-lease-convert#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/contrib/sethostname.sh#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/dhcpctl/Makefile.dist#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/dhcpctl/callback.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/dhcpctl/cltest.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/dhcpctl/dhcpctl.3#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/dhcpctl/dhcpctl.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/dhcpctl/dhcpctl.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/dhcpctl/omshell.1#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/dhcpctl/omshell.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/dhcpctl/remote.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/dst/Makefile.dist#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/dst/base64.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/dst/dst_api.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/dst/dst_internal.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/dst/dst_support.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/dst/hmac_link.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/dst/md5.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/dst/md5_dgst.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/dst/md5_locl.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/dst/prandom.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/arpa/nameser.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/arpa/nameser_compat.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/cdefs.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/cf/freebsd.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/ctrace.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/dhcp.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/dhcpd.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/dhctoken.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/failover.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/inet.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/isc-dhcp/boolean.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/isc-dhcp/dst.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/isc-dhcp/int.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/isc-dhcp/lang.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/isc-dhcp/list.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/isc-dhcp/result.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/isc-dhcp/types.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/minires/minires.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/minires/res_update.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/minires/resolv.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/netinet/if_ether.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/netinet/ip.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/netinet/ip_icmp.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/netinet/udp.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/omapip/alloc.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/omapip/buffer.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/omapip/convert.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/omapip/hash.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/omapip/omapip.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/omapip/omapip_p.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/omapip/trace.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/osdep.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/site.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/statement.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/tree.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/includes/version.h#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/minires/Makefile.dist#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/minires/ns_date.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/minires/ns_name.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/minires/ns_parse.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/minires/ns_samedomain.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/minires/ns_sign.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/minires/ns_verify.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/minires/res_comp.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/minires/res_findzonecut.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/minires/res_init.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/minires/res_mkquery.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/minires/res_mkupdate.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/minires/res_query.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/minires/res_send.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/minires/res_sendsigned.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/minires/res_update.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/omapip/Makefile.dist#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/omapip/alloc.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/omapip/array.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/omapip/auth.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/omapip/buffer.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/omapip/connection.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/omapip/convert.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/omapip/dispatch.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/omapip/errwarn.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/omapip/generic.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/omapip/handle.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/omapip/hash.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/omapip/inet_addr.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/omapip/listener.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/omapip/message.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/omapip/mrtrace.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/omapip/omapi.3#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/omapip/protocol.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/omapip/result.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/omapip/support.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/omapip/test.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/omapip/toisc.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/omapip/trace.c#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/site.conf#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/tests/failover/dhcp-1.cf#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/tests/failover/dhcp-2.cf#2 delete .. //depot/projects/wifi/contrib/isc-dhcp/tests/failover/new-failover#2 delete .. //depot/projects/wifi/contrib/libpcap/README.septel#1 branch .. //depot/projects/wifi/contrib/libpcap/pcap-septel.c#1 branch .. //depot/projects/wifi/contrib/libpcap/pcap-septel.h#1 branch .. //depot/projects/wifi/contrib/libpcap/rawss7.h#2 delete .. //depot/projects/wifi/contrib/netcat/nc.1#2 integrate .. //depot/projects/wifi/contrib/openpam/CREDITS#2 integrate .. //depot/projects/wifi/contrib/openpam/HISTORY#3 integrate .. //depot/projects/wifi/contrib/openpam/MANIFEST#3 integrate .. //depot/projects/wifi/contrib/openpam/Makefile.am#3 integrate .. //depot/projects/wifi/contrib/openpam/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/openpam/RELNOTES#3 integrate .. //depot/projects/wifi/contrib/openpam/aclocal.m4#3 integrate .. //depot/projects/wifi/contrib/openpam/autogen.sh#2 integrate .. //depot/projects/wifi/contrib/openpam/bin/Makefile.am#2 integrate .. //depot/projects/wifi/contrib/openpam/bin/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/openpam/bin/su/Makefile.am#2 integrate .. //depot/projects/wifi/contrib/openpam/bin/su/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/openpam/configure#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/Makefile.am#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/Makefile.am#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_borrow_cred.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_free_data.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_free_envlist.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_get_option.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_log.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_nullconv.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_readline.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_restore_cred.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_set_option.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/openpam_ttyconv.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam.conf.5#1 branch .. //depot/projects/wifi/contrib/openpam/doc/man/pam_acct_mgmt.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_authenticate.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_chauthtok.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_close_session.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_conv.3#2 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_end.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_error.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_get_authtok.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_get_data.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_get_item.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_get_user.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_getenv.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_getenvlist.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_info.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_open_session.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_prompt.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_putenv.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_set_data.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_set_item.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_setcred.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_setenv.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_sm_authenticate.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_sm_chauthtok.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_sm_close_session.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_sm_open_session.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_sm_setcred.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_start.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_strerror.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_verror.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_vinfo.3#3 integrate .. //depot/projects/wifi/contrib/openpam/doc/man/pam_vprompt.3#3 integrate .. //depot/projects/wifi/contrib/openpam/include/Makefile.am#2 integrate .. //depot/projects/wifi/contrib/openpam/include/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/openpam/include/security/Makefile.am#2 integrate .. //depot/projects/wifi/contrib/openpam/include/security/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/openpam/include/security/openpam_version.h#3 integrate .. //depot/projects/wifi/contrib/openpam/lib/Makefile.am#3 integrate .. //depot/projects/wifi/contrib/openpam/lib/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_dynamic.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_load.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_readline.c#2 integrate .. //depot/projects/wifi/contrib/openpam/lib/openpam_ttyconv.c#3 integrate .. //depot/projects/wifi/contrib/openpam/ltmain.sh#3 integrate .. //depot/projects/wifi/contrib/openpam/misc/gendoc.pl#3 integrate .. //depot/projects/wifi/contrib/openpam/modules/Makefile.am#2 integrate .. //depot/projects/wifi/contrib/openpam/modules/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/openpam/modules/pam_deny/Makefile.am#2 integrate .. //depot/projects/wifi/contrib/openpam/modules/pam_deny/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/openpam/modules/pam_deny/pam_deny.c#2 integrate .. //depot/projects/wifi/contrib/openpam/modules/pam_permit/Makefile.am#2 integrate .. //depot/projects/wifi/contrib/openpam/modules/pam_permit/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/openpam/modules/pam_unix/Makefile.am#2 integrate .. //depot/projects/wifi/contrib/openpam/modules/pam_unix/Makefile.in#3 integrate .. //depot/projects/wifi/contrib/pf/man/pflog.4#3 integrate .. //depot/projects/wifi/contrib/pf/man/pfsync.4#4 integrate .. //depot/projects/wifi/contrib/pf/pfctl/pfctl.8#3 integrate .. //depot/projects/wifi/contrib/pnpinfo/pnpinfo.8#2 integrate .. //depot/projects/wifi/contrib/sendmail/cf/ostype/freebsd6.m4#1 branch .. //depot/projects/wifi/contrib/tcpdump/atm.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/ip6.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/pcap_dump_ftell.c#1 branch .. //depot/projects/wifi/contrib/tcpdump/print-pgm.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/radius.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/radius.h#1 branch .. //depot/projects/wifi/crypto/heimdal/appl/su/Makefile.am#2 integrate .. //depot/projects/wifi/crypto/heimdal/appl/su/su.c#2 integrate .. //depot/projects/wifi/etc/etc.powerpc/ttys#2 integrate .. //depot/projects/wifi/etc/etc.sparc64/ttys#5 integrate .. //depot/projects/wifi/etc/inetd.conf#2 integrate .. //depot/projects/wifi/etc/mtree/BSD.local.dist#5 integrate .. //depot/projects/wifi/etc/mtree/BSD.x11-4.dist#4 integrate .. //depot/projects/wifi/etc/pam.d/Makefile#4 integrate .. //depot/projects/wifi/etc/pam.d/rexecd#2 delete .. //depot/projects/wifi/etc/rc.d/Makefile#9 integrate .. //depot/projects/wifi/etc/rc.d/ipfilter#2 integrate .. //depot/projects/wifi/etc/rc.d/jail#6 integrate .. //depot/projects/wifi/etc/rc.d/wpa_supplicant#1 branch .. //depot/projects/wifi/etc/sendmail/freebsd.mc#2 integrate .. //depot/projects/wifi/etc/sendmail/freefall.mc#2 integrate .. //depot/projects/wifi/gnu/usr.bin/cvs/Makefile.inc#2 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/kgdb/main.c#5 integrate .. //depot/projects/wifi/gnu/usr.bin/groff/Makefile.inc#2 integrate .. //depot/projects/wifi/gnu/usr.bin/groff/tmac/mdoc.local#5 integrate .. //depot/projects/wifi/gnu/usr.bin/gzip/gzip.c#2 integrate .. //depot/projects/wifi/gnu/usr.bin/man/Makefile.inc#2 integrate .. //depot/projects/wifi/gnu/usr.bin/rcs/Makefile.inc#2 integrate .. //depot/projects/wifi/gnu/usr.bin/send-pr/send-pr.1#3 integrate .. //depot/projects/wifi/gnu/usr.bin/texinfo/Makefile.inc#2 integrate .. //depot/projects/wifi/kerberos5/Makefile.inc#4 integrate .. //depot/projects/wifi/kerberos5/usr.bin/ksu/Makefile#4 integrate .. //depot/projects/wifi/lib/Makefile#8 integrate .. //depot/projects/wifi/lib/libarchive/libarchive-formats.5#5 integrate .. //depot/projects/wifi/lib/libarchive/tar.5#4 integrate .. //depot/projects/wifi/lib/libautofs/libautofs.3#3 integrate .. //depot/projects/wifi/lib/libc/gen/msgrcv.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/sem_init.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/sem_post.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/sem_wait.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/sysctl.3#4 integrate .. //depot/projects/wifi/lib/libc/gen/ttyname.3#4 integrate .. //depot/projects/wifi/lib/libc/i386/gen/_set_tp.c#5 integrate .. //depot/projects/wifi/lib/libc/net/gai_strerror.3#3 integrate .. //depot/projects/wifi/lib/libc/net/getaddrinfo.3#5 integrate .. //depot/projects/wifi/lib/libc/net/getnameinfo.3#5 integrate .. //depot/projects/wifi/lib/libc/net/inet6_rth_space.3#4 integrate .. //depot/projects/wifi/lib/libc/net/rcmd.3#2 integrate .. //depot/projects/wifi/lib/libc/nls/catgets.3#3 integrate .. //depot/projects/wifi/lib/libc/posix1e/mac_prepare.3#2 integrate .. //depot/projects/wifi/lib/libc/stdlib/grantpt.c#3 integrate .. //depot/projects/wifi/lib/libc/sys/Makefile.inc#2 integrate .. //depot/projects/wifi/lib/libc/sys/extattr_get_file.2#4 integrate .. //depot/projects/wifi/lib/libc/sys/fhopen.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/kenv.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/read.2#5 integrate .. //depot/projects/wifi/lib/libc/sys/send.2#6 integrate .. //depot/projects/wifi/lib/libc/sys/write.2#4 integrate .. //depot/projects/wifi/lib/libcam/camlib.c#2 integrate .. //depot/projects/wifi/lib/libdevinfo/devinfo.c#4 integrate .. //depot/projects/wifi/lib/libdevstat/devstat.3#2 integrate .. //depot/projects/wifi/lib/libkvm/kvm.c#2 integrate .. //depot/projects/wifi/lib/libkvm/kvm_alpha.c#2 integrate .. //depot/projects/wifi/lib/libkvm/kvm_amd64.c#2 integrate .. //depot/projects/wifi/lib/libkvm/kvm_arm.c#2 integrate .. //depot/projects/wifi/lib/libkvm/kvm_i386.c#2 integrate .. //depot/projects/wifi/lib/libkvm/kvm_ia64.c#2 integrate .. //depot/projects/wifi/lib/libkvm/kvm_powerpc.c#2 integrate .. //depot/projects/wifi/lib/libkvm/kvm_private.h#2 integrate .. //depot/projects/wifi/lib/libkvm/kvm_proc.c#5 integrate .. //depot/projects/wifi/lib/libkvm/kvm_sparc.c#2 integrate .. //depot/projects/wifi/lib/libkvm/kvm_sparc64.c#2 integrate .. //depot/projects/wifi/lib/libmd/sha.3#5 integrate .. //depot/projects/wifi/lib/libmd/sha256.3#2 integrate .. //depot/projects/wifi/lib/libmemstat/Makefile#1 branch .. //depot/projects/wifi/lib/libmemstat/libmemstat.3#1 branch .. //depot/projects/wifi/lib/libmemstat/memstat.c#1 branch .. //depot/projects/wifi/lib/libmemstat/memstat.h#1 branch .. //depot/projects/wifi/lib/libmemstat/memstat_all.c#1 branch .. //depot/projects/wifi/lib/libmemstat/memstat_internal.h#1 branch .. //depot/projects/wifi/lib/libmemstat/memstat_malloc.c#1 branch .. //depot/projects/wifi/lib/libmemstat/memstat_uma.c#1 branch .. //depot/projects/wifi/lib/libpam/Makefile.inc#2 integrate .. //depot/projects/wifi/lib/libpam/libpam/Makefile#5 integrate .. //depot/projects/wifi/lib/libpam/modules/pam_deny/pam_deny.c#2 integrate .. //depot/projects/wifi/lib/libpam/modules/pam_exec/pam_exec.8#3 integrate .. //depot/projects/wifi/lib/libpam/modules/pam_krb5/Makefile#2 integrate .. //depot/projects/wifi/lib/libpam/modules/pam_krb5/pam_krb5.c#3 integrate .. //depot/projects/wifi/lib/libpam/modules/pam_radius/pam_radius.c#2 integrate .. //depot/projects/wifi/lib/libpam/modules/pam_unix/pam_unix.c#3 integrate .. //depot/projects/wifi/lib/libpmc/Makefile#3 integrate .. //depot/projects/wifi/lib/libpmc/libpmc.c#5 integrate .. //depot/projects/wifi/lib/libpmc/pmc.3#4 integrate .. //depot/projects/wifi/lib/libpmc/pmc.h#3 integrate .. //depot/projects/wifi/lib/libpmc/pmclog.3#1 branch .. //depot/projects/wifi/lib/libpmc/pmclog.c#1 branch .. //depot/projects/wifi/lib/libpmc/pmclog.h#1 branch .. //depot/projects/wifi/lib/libpthread/arch/i386/i386/pthread_md.c#5 integrate .. //depot/projects/wifi/lib/libpthread/arch/i386/include/pthread_md.h#5 integrate .. //depot/projects/wifi/lib/libpthread/thread/thr_private.h#5 integrate .. //depot/projects/wifi/lib/libthr/Makefile#6 integrate .. //depot/projects/wifi/lib/libthr/libthr.3#1 branch .. //depot/projects/wifi/lib/libthr/thread/thr_private.h#6 integrate .. //depot/projects/wifi/lib/libz/inftrees.c#3 integrate .. //depot/projects/wifi/lib/msun/man/fenv.3#5 integrate .. //depot/projects/wifi/lib/msun/man/ieee.3#5 integrate .. //depot/projects/wifi/lib/msun/man/lround.3#3 integrate .. //depot/projects/wifi/lib/msun/man/math.3#8 integrate .. //depot/projects/wifi/lib/msun/man/round.3#4 integrate .. //depot/projects/wifi/lib/msun/man/trunc.3#3 integrate .. //depot/projects/wifi/libexec/Makefile#7 integrate .. //depot/projects/wifi/libexec/mail.local/Makefile#2 integrate .. //depot/projects/wifi/libexec/rexecd/Makefile#3 delete .. //depot/projects/wifi/libexec/rexecd/rexecd.8#3 delete .. //depot/projects/wifi/libexec/rexecd/rexecd.c#8 delete .. //depot/projects/wifi/libexec/rtld-elf/i386/reloc.c#5 integrate .. //depot/projects/wifi/libexec/rtld-elf/rtld.1#3 integrate .. //depot/projects/wifi/libexec/smrsh/Makefile#2 integrate .. //depot/projects/wifi/libexec/telnetd/Makefile#3 integrate .. //depot/projects/wifi/release/Makefile#10 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#5 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#15 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/installation/common/install.sgml#4 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#3 integrate .. //depot/projects/wifi/release/doc/ja_JP.eucJP/Makefile#2 integrate .. //depot/projects/wifi/release/doc/ja_JP.eucJP/early-adopter/Makefile#2 delete .. //depot/projects/wifi/release/doc/ja_JP.eucJP/early-adopter/article.sgml#3 delete .. //depot/projects/wifi/release/doc/ja_JP.eucJP/errata/article.sgml#2 integrate .. //depot/projects/wifi/release/doc/ja_JP.eucJP/hardware/common/artheader.sgml#2 integrate .. //depot/projects/wifi/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#5 integrate .. //depot/projects/wifi/release/doc/ja_JP.eucJP/relnotes/common/artheader.sgml#2 delete .. //depot/projects/wifi/release/doc/ja_JP.eucJP/relnotes/common/intro.sgml#2 delete .. //depot/projects/wifi/release/doc/ja_JP.eucJP/relnotes/common/relnotes.ent#2 integrate .. //depot/projects/wifi/release/doc/ja_JP.eucJP/relnotes/common/upgrading.sgml#2 delete .. //depot/projects/wifi/release/doc/ja_JP.eucJP/share/sgml/dev-auto-ja.sgml#2 integrate .. //depot/projects/wifi/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#5 integrate .. //depot/projects/wifi/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml#2 integrate .. //depot/projects/wifi/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#4 integrate .. //depot/projects/wifi/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml#3 integrate .. //depot/projects/wifi/release/doc/ru_RU.KOI8-R/readme/article.sgml#2 integrate .. //depot/projects/wifi/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#4 integrate .. //depot/projects/wifi/release/doc/ru_RU.KOI8-R/share/examples/dev-auto-translate.pl#3 integrate .. //depot/projects/wifi/release/doc/ru_RU.KOI8-R/share/sgml/dev-auto-ru.sgml#3 integrate .. //depot/projects/wifi/release/doc/share/misc/man2hwnotes.pl#3 integrate .. //depot/projects/wifi/release/scripts/lib32-make.sh#1 branch .. //depot/projects/wifi/sbin/camcontrol/camcontrol.8#4 integrate .. //depot/projects/wifi/sbin/devd/devd.cc#5 integrate .. //depot/projects/wifi/sbin/devd/devd.h#2 integrate .. //depot/projects/wifi/sbin/devd/devd.hh#2 integrate .. //depot/projects/wifi/sbin/devd/parse.y#2 integrate .. //depot/projects/wifi/sbin/devd/token.l#2 integrate .. //depot/projects/wifi/sbin/devfs/devfs.8#7 integrate .. //depot/projects/wifi/sbin/geom/class/raid3/geom_raid3.c#6 integrate .. //depot/projects/wifi/sbin/ggate/Makefile#2 integrate .. //depot/projects/wifi/sbin/ggate/ggatec/Makefile#2 integrate .. //depot/projects/wifi/sbin/ggate/ggatec/ggatec.c#2 integrate .. //depot/projects/wifi/sbin/ggate/ggated/Makefile#2 integrate .. //depot/projects/wifi/sbin/ggate/ggated/ggated.c#2 integrate .. //depot/projects/wifi/sbin/ggate/ggatel/ggatel.c#2 integrate .. //depot/projects/wifi/sbin/ggate/shared/ggate.c#2 integrate .. //depot/projects/wifi/sbin/ggate/shared/ggate.h#3 integrate .. //depot/projects/wifi/sbin/gpt/gpt.8#6 integrate .. //depot/projects/wifi/sbin/ifconfig/af_inet.c#3 integrate .. //depot/projects/wifi/sbin/ifconfig/af_inet6.c#7 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.c#14 integrate .. //depot/projects/wifi/sbin/ifconfig/ifconfig.h#11 integrate .. //depot/projects/wifi/sbin/mount/mount.8#6 integrate .. //depot/projects/wifi/sbin/mount_reiserfs/mount_reiserfs.8#2 integrate .. //depot/projects/wifi/sbin/startslip/startslip.1#2 integrate .. //depot/projects/wifi/sbin/sysctl/sysctl.8#5 integrate .. //depot/projects/wifi/share/doc/papers/Makefile#3 integrate .. //depot/projects/wifi/share/doc/papers/nqnfs/Makefile#3 delete .. //depot/projects/wifi/share/doc/papers/nqnfs/nqnfs.me#2 delete .. //depot/projects/wifi/share/examples/etc/make.conf#15 integrate .. //depot/projects/wifi/share/man/man1/builtin.1#4 integrate .. //depot/projects/wifi/share/man/man3/pthread_atfork.3#2 integrate .. //depot/projects/wifi/share/man/man3/pthread_cancel.3#2 integrate .. //depot/projects/wifi/share/man/man3/pthread_testcancel.3#3 integrate .. //depot/projects/wifi/share/man/man3/sysexits.3#3 integrate .. //depot/projects/wifi/share/man/man4/acpi.4#8 integrate .. //depot/projects/wifi/share/man/man4/agp.4#2 integrate .. //depot/projects/wifi/share/man/man4/altq.4#10 integrate .. //depot/projects/wifi/share/man/man4/ata.4#6 integrate .. //depot/projects/wifi/share/man/man4/awi.4#3 integrate .. //depot/projects/wifi/share/man/man4/carp.4#6 integrate .. //depot/projects/wifi/share/man/man4/cdce.4#3 integrate .. //depot/projects/wifi/share/man/man4/cpufreq.4#7 integrate .. //depot/projects/wifi/share/man/man4/dummynet.4#2 integrate .. //depot/projects/wifi/share/man/man4/ed.4#6 integrate .. //depot/projects/wifi/share/man/man4/fwohci.4#5 integrate .. //depot/projects/wifi/share/man/man4/geom.4#3 integrate .. //depot/projects/wifi/share/man/man4/hwpmc.4#3 integrate .. //depot/projects/wifi/share/man/man4/icmp6.4#4 integrate .. //depot/projects/wifi/share/man/man4/kbdmux.4#1 branch .. //depot/projects/wifi/share/man/man4/man4.i386/acpi_fujitsu.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/acpi_ibm.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/ep.4#6 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/mcd.4#4 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/pnp.4#3 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/smapi.4#2 integrate .. //depot/projects/wifi/share/man/man4/man4.sparc64/Makefile#3 integrate .. //depot/projects/wifi/share/man/man4/man4.sparc64/auxio.4#3 integrate .. //depot/projects/wifi/share/man/man4/man4.sparc64/central.4#1 branch .. //depot/projects/wifi/share/man/man4/man4.sparc64/clkbrd.4#1 branch .. //depot/projects/wifi/share/man/man4/man4.sparc64/creator.4#1 branch .. //depot/projects/wifi/share/man/man4/man4.sparc64/ebus.4#1 branch .. //depot/projects/wifi/share/man/man4/man4.sparc64/eeprom.4#1 branch .. //depot/projects/wifi/share/man/man4/man4.sparc64/fhc.4#1 branch .. //depot/projects/wifi/share/man/man4/man4.sparc64/machfb.4#1 branch .. //depot/projects/wifi/share/man/man4/man4.sparc64/ofw_console.4#1 branch .. //depot/projects/wifi/share/man/man4/man4.sparc64/openfirm.4#1 branch .. //depot/projects/wifi/share/man/man4/man4.sparc64/openprom.4#1 branch .. //depot/projects/wifi/share/man/man4/man4.sparc64/rtc.4#1 branch .. //depot/projects/wifi/share/man/man4/man4.sparc64/sbus.4#1 branch .. //depot/projects/wifi/share/man/man4/man4.sparc64/snd_audiocs.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_ccatm.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_nat.4#2 integrate .. //depot/projects/wifi/share/man/man4/ng_netflow.4#9 integrate .. //depot/projects/wifi/share/man/man4/ng_pppoe.4#4 integrate .. //depot/projects/wifi/share/man/man4/ng_source.4#6 integrate .. //depot/projects/wifi/share/man/man4/ng_tcpmss.4#1 branch .. //depot/projects/wifi/share/man/man4/nve.4#2 integrate .. //depot/projects/wifi/share/man/man4/ohci.4#3 integrate .. //depot/projects/wifi/share/man/man4/ral.4#2 integrate .. //depot/projects/wifi/share/man/man4/sched_4bsd.4#2 integrate .. //depot/projects/wifi/share/man/man4/sched_ule.4#2 integrate .. //depot/projects/wifi/share/man/man4/sn.4#3 integrate .. //depot/projects/wifi/share/man/man4/snd_emu10k1.4#4 integrate .. //depot/projects/wifi/share/man/man4/snd_maestro3.4#3 integrate .. //depot/projects/wifi/share/man/man4/snd_via8233.4#2 integrate .. //depot/projects/wifi/share/man/man4/unix.4#3 integrate .. //depot/projects/wifi/share/man/man4/ural.4#2 integrate .. //depot/projects/wifi/share/man/man4/wi.4#4 integrate .. //depot/projects/wifi/share/man/man4/witness.4#4 integrate .. //depot/projects/wifi/share/man/man4/wlan_tkip.4#4 integrate .. //depot/projects/wifi/share/man/man4/xe.4#3 integrate .. //depot/projects/wifi/share/man/man5/a.out.5#2 integrate .. //depot/projects/wifi/share/man/man5/autofs.5#3 integrate .. //depot/projects/wifi/share/man/man5/devfs.conf.5#2 integrate .. //depot/projects/wifi/share/man/man5/devfs.rules.5#2 integrate .. //depot/projects/wifi/share/man/man5/elf.5#3 integrate .. //depot/projects/wifi/share/man/man5/hosts.equiv.5#3 integrate .. //depot/projects/wifi/share/man/man5/make.conf.5#11 integrate .. //depot/projects/wifi/share/man/man5/periodic.conf.5#5 integrate .. //depot/projects/wifi/share/man/man7/clocks.7#3 integrate .. //depot/projects/wifi/share/man/man7/development.7#3 integrate .. //depot/projects/wifi/share/man/man7/firewall.7#4 integrate .. //depot/projects/wifi/share/man/man7/ports.7#6 integrate .. //depot/projects/wifi/share/man/man7/release.7#6 integrate .. //depot/projects/wifi/share/man/man7/sdoc.7#2 integrate .. //depot/projects/wifi/share/man/man7/security.7#4 integrate .. //depot/projects/wifi/share/man/man7/tuning.7#6 integrate .. //depot/projects/wifi/share/man/man9/BUF_LOCK.9#2 integrate .. //depot/projects/wifi/share/man/man9/BUF_LOCKFREE.9#2 integrate .. //depot/projects/wifi/share/man/man9/BUF_LOCKINIT.9#3 integrate .. //depot/projects/wifi/share/man/man9/BUF_REFCNT.9#2 integrate .. //depot/projects/wifi/share/man/man9/BUF_TIMELOCK.9#2 integrate .. //depot/projects/wifi/share/man/man9/BUF_UNLOCK.9#2 integrate .. //depot/projects/wifi/share/man/man9/DELAY.9#2 integrate .. //depot/projects/wifi/share/man/man9/DEVICE_ATTACH.9#3 integrate .. //depot/projects/wifi/share/man/man9/DEVICE_DETACH.9#3 integrate .. //depot/projects/wifi/share/man/man9/DEVICE_IDENTIFY.9#2 integrate .. //depot/projects/wifi/share/man/man9/DEVICE_PROBE.9#3 integrate .. //depot/projects/wifi/share/man/man9/DEVICE_SHUTDOWN.9#3 integrate .. //depot/projects/wifi/share/man/man9/MUTEX_PROFILING.9#4 integrate .. //depot/projects/wifi/share/man/man9/Makefile#12 integrate .. //depot/projects/wifi/share/man/man9/VFS_SYNC.9#4 integrate .. //depot/projects/wifi/share/man/man9/VFS_VGET.9#5 integrate .. //depot/projects/wifi/share/man/man9/VOP_ACCESS.9#3 integrate .. //depot/projects/wifi/share/man/man9/VOP_ACLCHECK.9#3 integrate .. //depot/projects/wifi/share/man/man9/VOP_ADVLOCK.9#3 integrate .. //depot/projects/wifi/share/man/man9/VOP_ATTRIB.9#3 integrate .. //depot/projects/wifi/share/man/man9/VOP_BWRITE.9#3 integrate .. //depot/projects/wifi/share/man/man9/VOP_CREATE.9#4 integrate .. //depot/projects/wifi/share/man/man9/VOP_FSYNC.9#3 integrate .. //depot/projects/wifi/share/man/man9/VOP_GETACL.9#3 integrate .. //depot/projects/wifi/share/man/man9/VOP_GETPAGES.9#3 integrate .. //depot/projects/wifi/share/man/man9/VOP_GETVOBJECT.9#3 integrate .. //depot/projects/wifi/share/man/man9/VOP_INACTIVE.9#3 integrate .. //depot/projects/wifi/share/man/man9/VOP_IOCTL.9#4 integrate .. //depot/projects/wifi/share/man/man9/VOP_LINK.9#3 integrate .. //depot/projects/wifi/share/man/man9/VOP_LOCK.9#4 integrate .. //depot/projects/wifi/share/man/man9/VOP_LOOKUP.9#4 integrate .. //depot/projects/wifi/share/man/man9/VOP_OPENCLOSE.9#4 integrate .. //depot/projects/wifi/share/man/man9/VOP_PATHCONF.9#3 integrate .. //depot/projects/wifi/share/man/man9/VOP_PRINT.9#3 integrate .. //depot/projects/wifi/share/man/man9/VOP_RDWR.9#3 integrate .. //depot/projects/wifi/share/man/man9/VOP_READDIR.9#3 integrate .. //depot/projects/wifi/share/man/man9/VOP_READLINK.9#3 integrate .. //depot/projects/wifi/share/man/man9/VOP_REALLOCBLKS.9#3 integrate .. //depot/projects/wifi/share/man/man9/VOP_REMOVE.9#3 integrate .. //depot/projects/wifi/share/man/man9/VOP_REVOKE.9#2 integrate .. //depot/projects/wifi/share/man/man9/VOP_SETACL.9#3 integrate .. //depot/projects/wifi/share/man/man9/VOP_SETEXTATTR.9#3 integrate .. //depot/projects/wifi/share/man/man9/VOP_STRATEGY.9#3 integrate .. //depot/projects/wifi/share/man/man9/acl.9#3 integrate .. //depot/projects/wifi/share/man/man9/alloc_unr.9#2 integrate .. //depot/projects/wifi/share/man/man9/bpf.9#6 integrate .. //depot/projects/wifi/share/man/man9/bus_alloc_resource.9#3 integrate .. //depot/projects/wifi/share/man/man9/bus_child_present.9#2 integrate .. //depot/projects/wifi/share/man/man9/bus_dma.9#6 integrate .. //depot/projects/wifi/share/man/man9/bus_generic_attach.9#2 integrate .. //depot/projects/wifi/share/man/man9/bus_generic_detach.9#2 integrate .. //depot/projects/wifi/share/man/man9/bus_generic_print_child.9#3 integrate .. //depot/projects/wifi/share/man/man9/bus_generic_read_ivar.9#2 integrate .. //depot/projects/wifi/share/man/man9/bus_generic_shutdown.9#2 integrate .. //depot/projects/wifi/share/man/man9/bus_release_resource.9#3 integrate .. //depot/projects/wifi/share/man/man9/bus_set_resource.9#2 integrate .. //depot/projects/wifi/share/man/man9/bus_space.9#1 branch .. //depot/projects/wifi/share/man/man9/crypto.9#2 integrate .. //depot/projects/wifi/share/man/man9/devclass.9#2 integrate .. //depot/projects/wifi/share/man/man9/devclass_add_driver.9#2 integrate .. //depot/projects/wifi/share/man/man9/devclass_find.9#2 integrate .. //depot/projects/wifi/share/man/man9/devclass_get_count.9#3 integrate .. //depot/projects/wifi/share/man/man9/devclass_get_device.9#2 integrate .. //depot/projects/wifi/share/man/man9/devclass_get_devices.9#3 integrate .. //depot/projects/wifi/share/man/man9/devclass_get_drivers.9#3 integrate .. //depot/projects/wifi/share/man/man9/devclass_get_maxunit.9#3 integrate .. //depot/projects/wifi/share/man/man9/devclass_get_name.9#2 integrate .. //depot/projects/wifi/share/man/man9/devclass_get_softc.9#2 integrate .. //depot/projects/wifi/share/man/man9/device.9#2 integrate .. //depot/projects/wifi/share/man/man9/device_find_child.9#3 integrate .. //depot/projects/wifi/share/man/man9/devsw.9#2 integrate .. //depot/projects/wifi/share/man/man9/domain.9#2 integrate .. //depot/projects/wifi/share/man/man9/driver.9#2 integrate .. //depot/projects/wifi/share/man/man9/extattr.9#2 integrate .. //depot/projects/wifi/share/man/man9/getnewvnode.9#2 integrate .. //depot/projects/wifi/share/man/man9/groupmember.9#2 integrate .. //depot/projects/wifi/share/man/man9/hexdump.9#2 integrate .. //depot/projects/wifi/share/man/man9/ieee80211.9#2 integrate .. //depot/projects/wifi/share/man/man9/ieee80211_crypto.9#2 integrate .. //depot/projects/wifi/share/man/man9/ieee80211_input.9#2 integrate .. //depot/projects/wifi/share/man/man9/ieee80211_ioctl.9#2 integrate .. //depot/projects/wifi/share/man/man9/ieee80211_node.9#2 integrate .. //depot/projects/wifi/share/man/man9/ieee80211_output.9#2 integrate .. //depot/projects/wifi/share/man/man9/ieee80211_proto.9#2 integrate .. //depot/projects/wifi/share/man/man9/kobj.9#2 integrate .. //depot/projects/wifi/share/man/man9/kthread.9#2 integrate .. //depot/projects/wifi/share/man/man9/ktr.9#3 integrate .. //depot/projects/wifi/share/man/man9/lock.9#2 integrate .. //depot/projects/wifi/share/man/man9/mac.9#4 integrate .. //depot/projects/wifi/share/man/man9/mbuf.9#5 integrate .. //depot/projects/wifi/share/man/man9/mbuf_tags.9#4 integrate .. //depot/projects/wifi/share/man/man9/module.9#3 integrate .. //depot/projects/wifi/share/man/man9/pci.9#3 integrate .. //depot/projects/wifi/share/man/man9/pfind.9#2 integrate .. //depot/projects/wifi/share/man/man9/pgfind.9#2 integrate .. //depot/projects/wifi/share/man/man9/pmap.9#2 integrate .. //depot/projects/wifi/share/man/man9/pmap_init.9#2 integrate .. //depot/projects/wifi/share/man/man9/pmap_page_init.9#1 branch .. //depot/projects/wifi/share/man/man9/rman.9#3 integrate .. //depot/projects/wifi/share/man/man9/selrecord.9#2 integrate .. //depot/projects/wifi/share/man/man9/signal.9#3 integrate .. //depot/projects/wifi/share/man/man9/sleep.9#3 integrate .. //depot/projects/wifi/share/man/man9/spl.9#2 integrate .. //depot/projects/wifi/share/man/man9/style.9#8 integrate .. //depot/projects/wifi/share/man/man9/taskqueue.9#8 integrate .. //depot/projects/wifi/share/man/man9/time.9#4 integrate .. //depot/projects/wifi/share/man/man9/timeout.9#5 integrate .. //depot/projects/wifi/share/man/man9/ucred.9#2 integrate .. //depot/projects/wifi/share/man/man9/uidinfo.9#2 integrate .. //depot/projects/wifi/share/man/man9/uio.9#4 integrate .. //depot/projects/wifi/share/man/man9/vaccess.9#2 integrate .. //depot/projects/wifi/share/man/man9/vaccess_acl_posix1e.9#2 integrate .. //depot/projects/wifi/share/man/man9/vcount.9#2 integrate .. //depot/projects/wifi/share/man/man9/vflush.9#3 integrate .. //depot/projects/wifi/share/man/man9/vfs_suser.9#3 integrate .. //depot/projects/wifi/share/man/man9/vfsconf.9#2 integrate .. //depot/projects/wifi/share/man/man9/vget.9#3 integrate .. //depot/projects/wifi/share/man/man9/vgone.9#2 integrate .. //depot/projects/wifi/share/man/man9/vhold.9#2 integrate .. //depot/projects/wifi/share/man/man9/vinvalbuf.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_map_check_protection.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_map_clean.9#3 integrate .. //depot/projects/wifi/share/man/man9/vm_map_create.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_map_delete.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_map_find.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_map_findspace.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_map_inherit.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_map_init.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_map_insert.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_map_lock.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_map_lookup.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_map_madvise.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_map_protect.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_map_remove.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_map_simplify_entry.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_map_stack.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_map_submap.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_map_wire.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_page_alloc.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_page_bits.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_page_flag.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_page_grab.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_page_io.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_page_lookup.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_page_protect.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_page_sleep_busy.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_page_unmanage.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_page_wakeup.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_page_wire.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_page_zero_fill.9#2 integrate .. //depot/projects/wifi/share/man/man9/vm_set_page_size.9#2 integrate .. //depot/projects/wifi/share/man/man9/vn_fullpath.9#2 integrate .. //depot/projects/wifi/share/man/man9/vn_isdisk.9#2 integrate .. //depot/projects/wifi/share/man/man9/vnode.9#3 integrate .. //depot/projects/wifi/share/man/man9/vput.9#2 integrate .. //depot/projects/wifi/share/man/man9/vref.9#2 integrate .. //depot/projects/wifi/share/man/man9/vrele.9#2 integrate .. //depot/projects/wifi/share/man/man9/zero_copy.9#3 integrate .. //depot/projects/wifi/share/zoneinfo/leapseconds#3 integrate .. //depot/projects/wifi/sys/alpha/alpha/pmap.c#6 integrate .. //depot/projects/wifi/sys/alpha/alpha/vm_machdep.c#7 integrate .. //depot/projects/wifi/sys/alpha/conf/.cvsignore#1 branch .. //depot/projects/wifi/sys/alpha/include/atomic.h#3 integrate .. //depot/projects/wifi/sys/alpha/include/pmc_mdep.h#2 integrate .. //depot/projects/wifi/sys/alpha/osf1/Makefile#2 integrate .. //depot/projects/wifi/sys/alpha/osf1/osf1_misc.c#7 integrate .. //depot/projects/wifi/sys/alpha/osf1/osf1_mount.c#5 integrate .. //depot/projects/wifi/sys/amd64/amd64/apic_vector.S#4 integrate .. //depot/projects/wifi/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/wifi/sys/amd64/amd64/exception.S#4 integrate .. //depot/projects/wifi/sys/amd64/amd64/intr_machdep.c#7 integrate .. //depot/projects/wifi/sys/amd64/amd64/local_apic.c#7 integrate .. //depot/projects/wifi/sys/amd64/amd64/machdep.c#11 integrate .. //depot/projects/wifi/sys/amd64/amd64/mp_machdep.c#8 integrate .. //depot/projects/wifi/sys/amd64/amd64/pmap.c#9 integrate .. //depot/projects/wifi/sys/amd64/amd64/support.S#3 integrate .. //depot/projects/wifi/sys/amd64/amd64/sys_machdep.c#3 integrate .. //depot/projects/wifi/sys/amd64/amd64/vm_machdep.c#9 integrate .. //depot/projects/wifi/sys/amd64/conf/.cvsignore#1 branch .. //depot/projects/wifi/sys/amd64/conf/GENERIC#10 integrate .. //depot/projects/wifi/sys/amd64/conf/NOTES#11 integrate .. //depot/projects/wifi/sys/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/wifi/sys/amd64/include/_types.h#4 integrate .. //depot/projects/wifi/sys/amd64/include/apicvar.h#5 integrate .. //depot/projects/wifi/sys/amd64/include/atomic.h#3 integrate .. //depot/projects/wifi/sys/amd64/include/param.h#5 integrate .. //depot/projects/wifi/sys/amd64/include/pmap.h#3 integrate .. //depot/projects/wifi/sys/amd64/include/pmc_mdep.h#3 integrate .. //depot/projects/wifi/sys/amd64/isa/clock.c#7 integrate .. //depot/projects/wifi/sys/amd64/linux32/linux32_machdep.c#5 integrate .. //depot/projects/wifi/sys/arm/arm/busdma_machdep.c#11 integrate .. //depot/projects/wifi/sys/arm/arm/db_interface.c#4 integrate .. //depot/projects/wifi/sys/arm/arm/intr.c#7 integrate .. //depot/projects/wifi/sys/arm/arm/nexus.c#3 integrate .. //depot/projects/wifi/sys/arm/arm/trap.c#12 integrate .. //depot/projects/wifi/sys/arm/conf/.cvsignore#1 branch .. //depot/projects/wifi/sys/arm/include/atomic.h#7 integrate .. //depot/projects/wifi/sys/arm/include/intr.h#4 integrate .. //depot/projects/wifi/sys/arm/include/pmc_mdep.h#2 integrate .. //depot/projects/wifi/sys/arm/sa11x0/sa11x0_irqhandler.c#3 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/i80321.c#5 integrate .. //depot/projects/wifi/sys/arm/xscale/i80321/i80321_pci.c#4 integrate .. //depot/projects/wifi/sys/boot/i386/libi386/Makefile#3 integrate .. //depot/projects/wifi/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/wifi/sys/cam/cam_periph.c#4 integrate .. //depot/projects/wifi/sys/cam/cam_queue.c#3 integrate .. //depot/projects/wifi/sys/cam/cam_sim.c#3 integrate .. //depot/projects/wifi/sys/cam/cam_xpt.c#11 integrate .. //depot/projects/wifi/sys/cam/cam_xpt_periph.h#3 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_low.c#4 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_sa.c#5 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_ses.c#4 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_targ_bh.c#3 integrate .. //depot/projects/wifi/sys/cam/scsi/scsi_target.c#5 integrate .. //depot/projects/wifi/sys/compat/freebsd32/freebsd32_util.h#2 integrate .. //depot/projects/wifi/sys/compat/ia32/ia32_reg.h#1 branch .. //depot/projects/wifi/sys/compat/linux/linux_getcwd.c#5 integrate .. //depot/projects/wifi/sys/compat/linux/linux_misc.c#8 integrate .. //depot/projects/wifi/sys/compat/linux/linux_socket.c#5 integrate .. //depot/projects/wifi/sys/compat/ndis/kern_ndis.c#14 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4.h#3 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_ipc.c#4 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_misc.c#6 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_socket.c#3 integrate .. //depot/projects/wifi/sys/compat/svr4/svr4_stream.c#5 integrate .. //depot/projects/wifi/sys/conf/Makefile.arm#7 integrate .. //depot/projects/wifi/sys/conf/files.alpha#5 integrate .. //depot/projects/wifi/sys/conf/files.amd64#13 integrate .. //depot/projects/wifi/sys/conf/files.arm#5 integrate .. //depot/projects/wifi/sys/conf/files.ia64#5 integrate .. //depot/projects/wifi/sys/conf/files.powerpc#3 integrate .. //depot/projects/wifi/sys/conf/files.sparc64#9 integrate .. //depot/projects/wifi/sys/conf/newvers.sh#4 integrate .. //depot/projects/wifi/sys/conf/options#19 integrate .. //depot/projects/wifi/sys/conf/options.amd64#5 integrate .. //depot/projects/wifi/sys/conf/options.i386#8 integrate .. //depot/projects/wifi/sys/conf/options.pc98#7 integrate .. //depot/projects/wifi/sys/conf/options.sparc64#3 integrate .. //depot/projects/wifi/sys/contrib/altq/altq/altq_rio.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/oltr/if_oltr.c#3 integrate .. //depot/projects/wifi/sys/contrib/dev/oltr/if_oltr_pci.c#2 integrate .. //depot/projects/wifi/sys/contrib/dev/oltr/if_oltrvar.h#2 integrate .. //depot/projects/wifi/sys/contrib/ipfilter/netinet/fil.c#6 integrate .. //depot/projects/wifi/sys/contrib/ipfilter/netinet/ip_htable.c#2 integrate .. //depot/projects/wifi/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/wifi/sys/contrib/pf/net/if_pflog.c#4 integrate .. //depot/projects/wifi/sys/contrib/pf/net/if_pflog.h#3 integrate .. //depot/projects/wifi/sys/contrib/pf/net/if_pfsync.c#5 integrate .. //depot/projects/wifi/sys/contrib/pf/net/if_pfsync.h#3 integrate .. //depot/projects/wifi/sys/contrib/pf/net/pf_ioctl.c#5 integrate .. //depot/projects/wifi/sys/ddb/db_command.c#4 integrate .. //depot/projects/wifi/sys/ddb/ddb.h#4 integrate .. //depot/projects/wifi/sys/dev/acpi_support/acpi_ibm.c#5 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_quirks#3 integrate .. //depot/projects/wifi/sys/dev/an/if_an.c#4 integrate .. //depot/projects/wifi/sys/dev/an/if_an_pccard.c#3 integrate .. //depot/projects/wifi/sys/dev/an/if_anreg.h#3 integrate .. //depot/projects/wifi/sys/dev/arl/if_arl.c#2 integrate .. //depot/projects/wifi/sys/dev/arl/if_arl_isa.c#2 integrate .. //depot/projects/wifi/sys/dev/arl/if_arlreg.h#2 integrate .. //depot/projects/wifi/sys/dev/ata/ata-card.c#8 integrate .. //depot/projects/wifi/sys/dev/ata/ata-disk.c#10 integrate .. //depot/projects/wifi/sys/dev/ata/ata-pci.c#10 integrate .. //depot/projects/wifi/sys/dev/ata/ata-pci.h#9 integrate .. //depot/projects/wifi/sys/dev/ata/ata-queue.c#9 integrate .. //depot/projects/wifi/sys/dev/ath/ath_rate/amrr/amrr.c#12 integrate .. //depot/projects/wifi/sys/dev/ath/ath_rate/onoe/onoe.c#12 integrate .. //depot/projects/wifi/sys/dev/ath/if_ath.c#85 integrate .. //depot/projects/wifi/sys/dev/atkbdc/atkbd.c#1 branch .. //depot/projects/wifi/sys/dev/atkbdc/atkbd_atkbdc.c#1 branch .. //depot/projects/wifi/sys/dev/atkbdc/atkbdc.c#1 branch .. //depot/projects/wifi/sys/dev/atkbdc/atkbdc_ebus.c#1 branch .. //depot/projects/wifi/sys/dev/atkbdc/atkbdc_isa.c#1 branch .. //depot/projects/wifi/sys/dev/atkbdc/atkbdc_subr.c#1 branch .. //depot/projects/wifi/sys/dev/atkbdc/atkbdc_subr.h#1 branch .. //depot/projects/wifi/sys/dev/atkbdc/atkbdcreg.h#1 branch .. //depot/projects/wifi/sys/dev/atkbdc/atkbdreg.h#1 branch .. //depot/projects/wifi/sys/dev/atkbdc/psm.c#1 branch .. //depot/projects/wifi/sys/dev/atkbdc/psm.h#1 branch .. //depot/projects/wifi/sys/dev/awi/awi.c#8 integrate .. //depot/projects/wifi/sys/dev/awi/awivar.h#4 integrate .. //depot/projects/wifi/sys/dev/awi/if_awi_pccard.c#3 integrate .. //depot/projects/wifi/sys/dev/bfe/if_bfereg.h#3 integrate .. //depot/projects/wifi/sys/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/wifi/sys/dev/cm/if_cm_isa.c#2 integrate .. //depot/projects/wifi/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/wifi/sys/dev/cm/smc90cx6var.h#2 integrate .. //depot/projects/wifi/sys/dev/cp/if_cp.c#7 integrate .. //depot/projects/wifi/sys/dev/cs/if_cs.c#5 integrate .. //depot/projects/wifi/sys/dev/cs/if_cs_pccard.c#6 integrate .. //depot/projects/wifi/sys/dev/cs/if_csvar.h#5 integrate .. //depot/projects/wifi/sys/dev/ctau/if_ct.c#7 integrate .. //depot/projects/wifi/sys/dev/cx/if_cx.c#6 integrate .. //depot/projects/wifi/sys/dev/drm/radeon_cp.c#4 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed.c#9 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_3c503.c#2 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_cbus.c#6 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_hpp.c#2 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_isa.c#5 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_novell.c#3 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_pccard.c#7 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_pci.c#6 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_sic.c#3 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_wd80x3.c#3 integrate .. //depot/projects/wifi/sys/dev/ed/if_edvar.h#6 integrate .. //depot/projects/wifi/sys/dev/em/README#3 integrate .. //depot/projects/wifi/sys/dev/em/if_em.c#11 integrate .. //depot/projects/wifi/sys/dev/em/if_em.h#5 integrate .. //depot/projects/wifi/sys/dev/en/if_en_pci.c#4 integrate .. //depot/projects/wifi/sys/dev/en/midway.c#3 integrate .. //depot/projects/wifi/sys/dev/en/midwayvar.h#3 integrate .. //depot/projects/wifi/sys/dev/ep/if_ep.c#5 integrate .. //depot/projects/wifi/sys/dev/ep/if_ep_isa.c#4 integrate .. //depot/projects/wifi/sys/dev/ep/if_ep_mca.c#3 integrate .. //depot/projects/wifi/sys/dev/ep/if_ep_pccard.c#4 integrate .. //depot/projects/wifi/sys/dev/ep/if_epvar.h#4 integrate .. //depot/projects/wifi/sys/dev/ex/if_ex.c#3 integrate .. //depot/projects/wifi/sys/dev/ex/if_ex_isa.c#2 integrate .. //depot/projects/wifi/sys/dev/ex/if_ex_pccard.c#3 integrate .. //depot/projects/wifi/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/wifi/sys/dev/fatm/if_fatm.c#4 integrate .. //depot/projects/wifi/sys/dev/fatm/if_fatmvar.h#3 integrate .. //depot/projects/wifi/sys/dev/fdc/fdc_pccard.c#4 integrate .. //depot/projects/wifi/sys/dev/fe/if_fe.c#4 integrate .. //depot/projects/wifi/sys/dev/fe/if_fe_cbus.c#4 integrate .. //depot/projects/wifi/sys/dev/fe/if_fe_isa.c#4 integrate .. //depot/projects/wifi/sys/dev/fe/if_fe_pccard.c#5 integrate .. //depot/projects/wifi/sys/dev/fe/if_fevar.h#4 integrate .. //depot/projects/wifi/sys/dev/firewire/if_fwe.c#3 integrate .. //depot/projects/wifi/sys/dev/firewire/if_fwevar.h#3 integrate .. //depot/projects/wifi/sys/dev/firewire/if_fwip.c#3 integrate .. //depot/projects/wifi/sys/dev/firewire/if_fwipvar.h#3 integrate .. //depot/projects/wifi/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/wifi/sys/dev/gem/if_gem_pci.c#4 integrate .. //depot/projects/wifi/sys/dev/gem/if_gemvar.h#3 integrate .. //depot/projects/wifi/sys/dev/harp/if_harp.c#3 integrate .. //depot/projects/wifi/sys/dev/hatm/if_hatm.c#4 integrate .. //depot/projects/wifi/sys/dev/hatm/if_hatm_intr.c#3 integrate .. //depot/projects/wifi/sys/dev/hatm/if_hatm_ioctl.c#3 integrate .. //depot/projects/wifi/sys/dev/hatm/if_hatm_rx.c#3 integrate .. //depot/projects/wifi/sys/dev/hatm/if_hatm_tx.c#4 integrate .. //depot/projects/wifi/sys/dev/hatm/if_hatmvar.h#3 integrate .. //depot/projects/wifi/sys/dev/hfa/fore_output.c#3 integrate .. //depot/projects/wifi/sys/dev/hfa/fore_receive.c#2 integrate .. //depot/projects/wifi/sys/dev/hfa/fore_transmit.c#2 integrate .. //depot/projects/wifi/sys/dev/hme/if_hme.c#6 integrate .. //depot/projects/wifi/sys/dev/hme/if_hme_pci.c#6 integrate .. //depot/projects/wifi/sys/dev/hme/if_hme_sbus.c#4 integrate .. //depot/projects/wifi/sys/dev/hme/if_hmevar.h#3 integrate .. //depot/projects/wifi/sys/dev/hwpmc/hwpmc_alpha.c#1 branch .. //depot/projects/wifi/sys/dev/hwpmc/hwpmc_amd.h#1 branch .. //depot/projects/wifi/sys/dev/hwpmc/hwpmc_arm.c#1 branch .. //depot/projects/wifi/sys/dev/hwpmc/hwpmc_ia64.c#1 branch .. //depot/projects/wifi/sys/dev/hwpmc/hwpmc_intel.c#3 delete .. //depot/projects/wifi/sys/dev/hwpmc/hwpmc_logging.c#1 branch .. //depot/projects/wifi/sys/dev/hwpmc/hwpmc_mod.c#3 integrate .. //depot/projects/wifi/sys/dev/hwpmc/hwpmc_pentium.c#2 integrate .. //depot/projects/wifi/sys/dev/hwpmc/hwpmc_pentium.h#1 branch .. //depot/projects/wifi/sys/dev/hwpmc/hwpmc_piv.h#1 branch .. //depot/projects/wifi/sys/dev/hwpmc/hwpmc_powerpc.c#1 branch .. //depot/projects/wifi/sys/dev/hwpmc/hwpmc_ppro.h#1 branch .. //depot/projects/wifi/sys/dev/hwpmc/hwpmc_sparc64.c#1 branch .. //depot/projects/wifi/sys/dev/hwpmc/hwpmc_x86.c#1 branch .. //depot/projects/wifi/sys/dev/hwpmc/pmc_events.h#1 branch .. //depot/projects/wifi/sys/dev/ichsmb/ichsmb.c#4 integrate .. //depot/projects/wifi/sys/dev/ichsmb/ichsmb_var.h#3 integrate .. //depot/projects/wifi/sys/dev/idt/idt.c#3 integrate .. //depot/projects/wifi/sys/dev/ie/if_ievar.h#2 integrate .. //depot/projects/wifi/sys/dev/if_ndis/if_ndisvar.h#10 integrate .. //depot/projects/wifi/sys/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#5 integrate .. //depot/projects/wifi/sys/dev/iwi/if_iwivar.h#4 integrate .. //depot/projects/wifi/sys/dev/ixgb/if_ixgb.c#7 integrate .. //depot/projects/wifi/sys/dev/ixgb/if_ixgb.h#6 integrate .. //depot/projects/wifi/sys/dev/kbd/atkbd.c#4 delete .. //depot/projects/wifi/sys/dev/kbd/atkbdcreg.h#2 delete .. //depot/projects/wifi/sys/dev/kbd/atkbdreg.h#3 delete .. //depot/projects/wifi/sys/dev/kbd/kbd.c#3 integrate .. //depot/projects/wifi/sys/dev/kbd/kbdreg.h#2 integrate .. //depot/projects/wifi/sys/dev/kbdmux/kbdmux.c#1 branch .. //depot/projects/wifi/sys/dev/lge/if_lgereg.h#3 integrate .. //depot/projects/wifi/sys/dev/lnc/if_lnc.c#2 integrate .. //depot/projects/wifi/sys/dev/lnc/if_lnc_cbus.c#3 integrate .. //depot/projects/wifi/sys/dev/lnc/if_lnc_isa.c#3 integrate .. //depot/projects/wifi/sys/dev/lnc/if_lnc_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/lnc/if_lncvar.h#2 integrate .. //depot/projects/wifi/sys/dev/mii/mii.c#6 integrate .. //depot/projects/wifi/sys/dev/mpt/mpilib/fc_log.h#3 integrate .. //depot/projects/wifi/sys/dev/mpt/mpilib/mpi.h#3 integrate .. //depot/projects/wifi/sys/dev/mpt/mpilib/mpi_cnfg.h#3 integrate .. //depot/projects/wifi/sys/dev/mpt/mpilib/mpi_fc.h#3 integrate .. //depot/projects/wifi/sys/dev/mpt/mpilib/mpi_init.h#3 integrate .. //depot/projects/wifi/sys/dev/mpt/mpilib/mpi_ioc.h#3 integrate .. //depot/projects/wifi/sys/dev/mpt/mpilib/mpi_lan.h#3 integrate .. //depot/projects/wifi/sys/dev/mpt/mpilib/mpi_raid.h#3 integrate .. //depot/projects/wifi/sys/dev/mpt/mpilib/mpi_targ.h#3 integrate .. //depot/projects/wifi/sys/dev/mpt/mpilib/mpi_type.h#4 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt_cam.c#1 branch .. //depot/projects/wifi/sys/dev/mpt/mpt_cam.h#1 branch .. //depot/projects/wifi/sys/dev/mpt/mpt_debug.c#3 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt_freebsd.c#3 delete .. //depot/projects/wifi/sys/dev/mpt/mpt_raid.c#1 branch .. //depot/projects/wifi/sys/dev/mpt/mpt_raid.h#1 branch .. //depot/projects/wifi/sys/dev/mpt/mpt_reg.h#1 branch .. //depot/projects/wifi/sys/dev/my/if_myreg.h#3 integrate .. //depot/projects/wifi/sys/dev/nge/if_ngereg.h#3 integrate .. //depot/projects/wifi/sys/dev/nsp/nsp_pccard.c#4 integrate .. //depot/projects/wifi/sys/dev/nve/if_nvereg.h#2 integrate .. //depot/projects/wifi/sys/dev/owi/if_owi.c#3 integrate .. //depot/projects/wifi/sys/dev/owi/if_owi_pccard.c#4 integrate .. //depot/projects/wifi/sys/dev/owi/if_wivar.h#3 integrate .. //depot/projects/wifi/sys/dev/patm/if_patm.c#3 integrate .. //depot/projects/wifi/sys/dev/patm/if_patm_attach.c#4 integrate .. //depot/projects/wifi/sys/dev/patm/if_patm_intr.c#3 integrate .. //depot/projects/wifi/sys/dev/patm/if_patm_ioctl.c#3 integrate .. //depot/projects/wifi/sys/dev/patm/if_patm_rx.c#3 integrate .. //depot/projects/wifi/sys/dev/patm/if_patm_tx.c#3 integrate .. //depot/projects/wifi/sys/dev/patm/if_patmvar.h#3 integrate .. //depot/projects/wifi/sys/dev/pccard/card_if.m#5 integrate .. //depot/projects/wifi/sys/dev/pccard/pccard.c#8 integrate .. //depot/projects/wifi/sys/dev/pccard/pccard_cis.c#6 integrate .. //depot/projects/wifi/sys/dev/pccard/pccard_cis.h#4 integrate .. //depot/projects/wifi/sys/dev/pccard/pccarddevs#8 integrate .. //depot/projects/wifi/sys/dev/pccard/pccardvar.h#4 integrate .. //depot/projects/wifi/sys/dev/pccbb/pccbb.c#4 integrate .. //depot/projects/wifi/sys/dev/pccbb/pccbbvar.h#4 integrate .. //depot/projects/wifi/sys/dev/pdq/if_fea.c#2 integrate .. //depot/projects/wifi/sys/dev/pdq/pdq.c#2 integrate .. //depot/projects/wifi/sys/dev/pdq/pdqvar.h#2 integrate .. //depot/projects/wifi/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/wifi/sys/dev/ral/if_ral.c#3 integrate .. //depot/projects/wifi/sys/dev/ral/if_ral_pccard.c#2 integrate .. //depot/projects/wifi/sys/dev/ral/if_ralvar.h#2 integrate .. //depot/projects/wifi/sys/dev/ray/if_ray.c#7 integrate .. //depot/projects/wifi/sys/dev/ray/if_rayvar.h#6 integrate .. //depot/projects/wifi/sys/dev/sbni/if_sbni.c#3 integrate .. //depot/projects/wifi/sys/dev/sbni/if_sbni_isa.c#3 integrate .. //depot/projects/wifi/sys/dev/sbni/if_sbnivar.h#3 integrate .. //depot/projects/wifi/sys/dev/sbsh/if_sbsh.c#3 integrate .. //depot/projects/wifi/sys/dev/sn/if_sn.c#3 integrate .. //depot/projects/wifi/sys/dev/sn/if_sn_isa.c#3 integrate .. //depot/projects/wifi/sys/dev/sn/if_sn_pccard.c#3 integrate .. //depot/projects/wifi/sys/dev/sn/if_snvar.h#3 integrate .. //depot/projects/wifi/sys/dev/sn/ositech.h#1 branch .. //depot/projects/wifi/sys/dev/snc/dp83932.c#4 integrate .. //depot/projects/wifi/sys/dev/snc/dp83932var.h#3 integrate .. //depot/projects/wifi/sys/dev/snc/if_snc_pccard.c#4 integrate .. //depot/projects/wifi/sys/dev/sound/isa/mss.c#4 integrate .. //depot/projects/wifi/sys/dev/sound/pci/csa.c#4 integrate .. //depot/projects/wifi/sys/dev/sound/pci/csapcm.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/pci/csareg.h#2 integrate .. //depot/projects/wifi/sys/dev/sound/pci/csavar.h#2 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/channel.c#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_osl_cam.c#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_osl_share.h#2 integrate .. //depot/projects/wifi/sys/dev/tx/if_txvar.h#2 integrate .. //depot/projects/wifi/sys/dev/txp/if_txpreg.h#3 integrate .. //depot/projects/wifi/sys/dev/uart/uart_cpu_alpha.c#4 integrate .. //depot/projects/wifi/sys/dev/usb/ehci_pci.c#5 integrate .. //depot/projects/wifi/sys/dev/usb/if_aue.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 15 01:21:13 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F8C116A420; Fri, 15 Jul 2005 01:21:13 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 98D9216A41C for ; Fri, 15 Jul 2005 01:21:12 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2ED3243D45 for ; Fri, 15 Jul 2005 01:21:12 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6F1LC8D048565 for ; Fri, 15 Jul 2005 01:21:12 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6F1Kkgj048535 for perforce@freebsd.org; Fri, 15 Jul 2005 01:20:46 GMT (envelope-from sam@freebsd.org) Date: Fri, 15 Jul 2005 01:20:46 GMT Message-Id: <200507150120.j6F1Kkgj048535@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 80221 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2005 01:21:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=80221 Change 80221 by sam@sam_ebb on 2005/07/15 01:19:48 IFC @ 78171 Affected files ... .. //depot/projects/wifi/LOCKS#1 branch .. //depot/projects/wifi/MAINTAINERS#6 integrate .. //depot/projects/wifi/Makefile.inc1#20 integrate .. //depot/projects/wifi/UPDATING#17 integrate .. //depot/projects/wifi/bin/ls/cmp.c#3 integrate .. //depot/projects/wifi/bin/ls/extern.h#2 integrate .. //depot/projects/wifi/bin/ls/ls.1#5 integrate .. //depot/projects/wifi/bin/ls/ls.c#3 integrate .. //depot/projects/wifi/bin/ls/util.c#4 integrate .. //depot/projects/wifi/bin/rmdir/rmdir.1#3 integrate .. //depot/projects/wifi/contrib/bzip2/bzlib.c#3 integrate .. //depot/projects/wifi/contrib/diff/diff.c#2 integrate .. //depot/projects/wifi/contrib/gcc/ChangeLog#2 integrate .. //depot/projects/wifi/contrib/gcc/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/gcc/attribs.c#2 integrate .. //depot/projects/wifi/contrib/gcc/builtins.c#2 integrate .. //depot/projects/wifi/contrib/gcc/c-common.c#2 integrate .. //depot/projects/wifi/contrib/gcc/c-decl.c#2 integrate .. //depot/projects/wifi/contrib/gcc/c-format.c#2 integrate .. //depot/projects/wifi/contrib/gcc/c-opts.c#2 integrate .. //depot/projects/wifi/contrib/gcc/c-parse.in#2 integrate .. //depot/projects/wifi/contrib/gcc/c-ppoutput.c#2 integrate .. //depot/projects/wifi/contrib/gcc/c-semantics.c#2 integrate .. //depot/projects/wifi/contrib/gcc/c-typeck.c#2 integrate .. //depot/projects/wifi/contrib/gcc/c.opt#2 integrate .. //depot/projects/wifi/contrib/gcc/calls.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cfglayout.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cfgrtl.c#2 integrate .. //depot/projects/wifi/contrib/gcc/collect2.c#2 integrate .. //depot/projects/wifi/contrib/gcc/combine.c#2 integrate .. //depot/projects/wifi/contrib/gcc/common.opt#2 integrate .. //depot/projects/wifi/contrib/gcc/config.gcc#2 integrate .. //depot/projects/wifi/contrib/gcc/config.in#2 integrate .. //depot/projects/wifi/contrib/gcc/config/alpha/alpha.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/alpha/alpha.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/alpha/alpha.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/alpha/qrnnd.asm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/alpha/t-osf4#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/arm-protos.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/arm.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/arm.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/arm.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/t-netbsd#2 integrate .. //depot/projects/wifi/contrib/gcc/config/arm/t-rtems#1 branch .. //depot/projects/wifi/contrib/gcc/config/darwin-protos.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/darwin.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/darwin.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/freebsd-spec.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/freebsd.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/cygwin1.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/darwin.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/emmintrin.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/freebsd.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/gthr-win32.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/i386-modes.def#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/i386-protos.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/i386.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/i386.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/i386.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/t-rtems-i386#2 integrate .. //depot/projects/wifi/contrib/gcc/config/i386/xmmintrin.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/ia64.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/t-glibc#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/t-glibc-libunwind#1 branch .. //depot/projects/wifi/contrib/gcc/config/ia64/t-hpux#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/unwind-ia64.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/ia64/unwind-ia64.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/aix.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/aix41.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/aix43.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/aix52.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/altivec.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/altivec.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/beos.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/darwin-ldouble-shared.c#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/darwin-ldouble.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/darwin.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/eabi.asm#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/libgcc-ppc64.ver#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/linux-unwind.h#1 branch .. //depot/projects/wifi/contrib/gcc/config/rs6000/linux.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/linux64.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/rs6000-c.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/rs6000-protos.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/rs6000.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/rs6000.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/rs6000.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/rtems.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/spe.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/spe.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/sysv4.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/t-aix43#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/t-aix52#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/t-linux64#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/t-newas#2 integrate .. //depot/projects/wifi/contrib/gcc/config/rs6000/t-rtems#2 integrate .. //depot/projects/wifi/contrib/gcc/config/s390/s390.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/s390/tpf.h#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/sparc.c#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/sparc.md#2 integrate .. //depot/projects/wifi/contrib/gcc/config/sparc/t-elf#2 integrate .. //depot/projects/wifi/contrib/gcc/config/t-libunwind#2 integrate .. //depot/projects/wifi/contrib/gcc/config/t-libunwind-elf#1 branch .. //depot/projects/wifi/contrib/gcc/config/t-slibgcc-darwin#2 integrate .. //depot/projects/wifi/contrib/gcc/config/t-slibgcc-elf-ver#2 integrate .. //depot/projects/wifi/contrib/gcc/config/t-slibgcc-sld#2 integrate .. //depot/projects/wifi/contrib/gcc/configure#2 integrate .. //depot/projects/wifi/contrib/gcc/configure.ac#2 integrate .. //depot/projects/wifi/contrib/gcc/cp-demangle.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/ChangeLog#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/Make-lang.in#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/call.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/class.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/cp-tree.h#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/cvt.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/cxx-pretty-print.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/decl.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/decl2.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/error.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/except.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/g++spec.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/init.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/mangle.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/method.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/name-lookup.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/parser.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/pt.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/search.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/semantics.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/tree.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/typeck.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cp/typeck2.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cppfiles.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cpplib.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cppmacro.c#2 integrate .. //depot/projects/wifi/contrib/gcc/crtstuff.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cse.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cselib.c#2 integrate .. //depot/projects/wifi/contrib/gcc/cselib.h#2 integrate .. //depot/projects/wifi/contrib/gcc/dbxout.c#2 integrate .. //depot/projects/wifi/contrib/gcc/defaults.h#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/extend.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/include/gcc-common.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/invoke.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/md.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/tm.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/doc/trouble.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/dojump.c#2 integrate .. //depot/projects/wifi/contrib/gcc/dwarf2out.c#2 integrate .. //depot/projects/wifi/contrib/gcc/emit-rtl.c#2 integrate .. //depot/projects/wifi/contrib/gcc/explow.c#2 integrate .. //depot/projects/wifi/contrib/gcc/expmed.c#2 integrate .. //depot/projects/wifi/contrib/gcc/expr.c#2 integrate .. //depot/projects/wifi/contrib/gcc/expr.h#2 integrate .. //depot/projects/wifi/contrib/gcc/f/ChangeLog#2 integrate .. //depot/projects/wifi/contrib/gcc/f/bld.c#2 integrate .. //depot/projects/wifi/contrib/gcc/f/malloc.c#2 integrate .. //depot/projects/wifi/contrib/gcc/f/news.texi#2 integrate .. //depot/projects/wifi/contrib/gcc/flow.c#2 integrate .. //depot/projects/wifi/contrib/gcc/fold-const.c#2 integrate .. //depot/projects/wifi/contrib/gcc/function.c#2 integrate .. //depot/projects/wifi/contrib/gcc/gcc.c#2 integrate .. //depot/projects/wifi/contrib/gcc/gcov-io.h#2 integrate .. //depot/projects/wifi/contrib/gcc/gcse.c#2 integrate .. //depot/projects/wifi/contrib/gcc/ginclude/stddef.h#2 integrate .. //depot/projects/wifi/contrib/gcc/gthr-win32.h#2 integrate .. //depot/projects/wifi/contrib/gcc/hooks.c#2 integrate .. //depot/projects/wifi/contrib/gcc/hooks.h#2 integrate .. //depot/projects/wifi/contrib/gcc/ifcvt.c#2 integrate .. //depot/projects/wifi/contrib/gcc/jump.c#2 integrate .. //depot/projects/wifi/contrib/gcc/libgcc-darwin.ver#2 integrate .. //depot/projects/wifi/contrib/gcc/libgcc-std.ver#2 integrate .. //depot/projects/wifi/contrib/gcc/libgcc2.c#2 integrate .. //depot/projects/wifi/contrib/gcc/libgcc2.h#2 integrate .. //depot/projects/wifi/contrib/gcc/loop-unroll.c#2 integrate .. //depot/projects/wifi/contrib/gcc/loop.c#2 integrate .. //depot/projects/wifi/contrib/gcc/mkheaders.in#2 integrate .. //depot/projects/wifi/contrib/gcc/mklibgcc.in#2 integrate .. //depot/projects/wifi/contrib/gcc/objc/objc-act.c#2 integrate .. //depot/projects/wifi/contrib/gcc/params.def#2 integrate .. //depot/projects/wifi/contrib/gcc/params.h#2 integrate .. //depot/projects/wifi/contrib/gcc/postreload.c#2 integrate .. //depot/projects/wifi/contrib/gcc/predict.c#2 integrate .. //depot/projects/wifi/contrib/gcc/real.c#2 integrate .. //depot/projects/wifi/contrib/gcc/reg-stack.c#2 integrate .. //depot/projects/wifi/contrib/gcc/regclass.c#2 integrate .. //depot/projects/wifi/contrib/gcc/regrename.c#2 integrate .. //depot/projects/wifi/contrib/gcc/regs.h#2 integrate .. //depot/projects/wifi/contrib/gcc/reload.c#2 integrate .. //depot/projects/wifi/contrib/gcc/reload1.c#2 integrate .. //depot/projects/wifi/contrib/gcc/rtl.h#2 integrate .. //depot/projects/wifi/contrib/gcc/sibcall.c#2 integrate .. //depot/projects/wifi/contrib/gcc/simplify-rtx.c#2 integrate .. //depot/projects/wifi/contrib/gcc/target-def.h#2 integrate .. //depot/projects/wifi/contrib/gcc/target.h#2 integrate .. //depot/projects/wifi/contrib/gcc/toplev.c#2 integrate .. //depot/projects/wifi/contrib/gcc/tree-inline.c#2 integrate .. //depot/projects/wifi/contrib/gcc/tree.c#2 integrate .. //depot/projects/wifi/contrib/gcc/tree.h#2 integrate .. //depot/projects/wifi/contrib/gcc/unwind-compat.c#1 branch .. //depot/projects/wifi/contrib/gcc/unwind-compat.h#1 branch .. //depot/projects/wifi/contrib/gcc/unwind-dw2-fde-compat.c#1 branch .. //depot/projects/wifi/contrib/gcc/unwind-dw2-fde-glibc.c#2 integrate .. //depot/projects/wifi/contrib/gcc/unwind-dw2.c#2 integrate .. //depot/projects/wifi/contrib/gcc/varasm.c#2 integrate .. //depot/projects/wifi/contrib/gcc/version.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/COPYING#1 branch .. //depot/projects/wifi/contrib/hostapd/ChangeLog#1 branch .. //depot/projects/wifi/contrib/hostapd/FREEBSD-Xlist#1 branch .. //depot/projects/wifi/contrib/hostapd/FREEBSD-upgrade#1 branch .. //depot/projects/wifi/contrib/hostapd/Makefile#1 branch .. //depot/projects/wifi/contrib/hostapd/README#1 branch .. //depot/projects/wifi/contrib/hostapd/accounting.c#1 branch .. //depot/projects/wifi/contrib/hostapd/accounting.h#1 branch .. //depot/projects/wifi/contrib/hostapd/aes.c#1 branch .. //depot/projects/wifi/contrib/hostapd/aes_wrap.c#1 branch .. //depot/projects/wifi/contrib/hostapd/aes_wrap.h#1 branch .. //depot/projects/wifi/contrib/hostapd/ap.h#1 branch .. //depot/projects/wifi/contrib/hostapd/common.c#1 branch .. //depot/projects/wifi/contrib/hostapd/common.h#1 branch .. //depot/projects/wifi/contrib/hostapd/config.c#1 branch .. //depot/projects/wifi/contrib/hostapd/config.h#1 branch .. //depot/projects/wifi/contrib/hostapd/crypto.c#1 branch .. //depot/projects/wifi/contrib/hostapd/crypto.h#1 branch .. //depot/projects/wifi/contrib/hostapd/ctrl_iface.c#1 branch .. //depot/projects/wifi/contrib/hostapd/ctrl_iface.h#1 branch .. //depot/projects/wifi/contrib/hostapd/defconfig#1 branch .. //depot/projects/wifi/contrib/hostapd/defs.h#1 branch .. //depot/projects/wifi/contrib/hostapd/developer.txt#1 branch .. //depot/projects/wifi/contrib/hostapd/driver.h#1 branch .. //depot/projects/wifi/contrib/hostapd/driver_test.c#1 branch .. //depot/projects/wifi/contrib/hostapd/driver_wired.c#1 branch .. //depot/projects/wifi/contrib/hostapd/eap.c#1 branch .. //depot/projects/wifi/contrib/hostapd/eap.h#1 branch .. //depot/projects/wifi/contrib/hostapd/eap_defs.h#1 branch .. //depot/projects/wifi/contrib/hostapd/eap_gtc.c#1 branch .. //depot/projects/wifi/contrib/hostapd/eap_i.h#1 branch .. //depot/projects/wifi/contrib/hostapd/eap_identity.c#1 branch .. //depot/projects/wifi/contrib/hostapd/eap_md5.c#1 branch .. //depot/projects/wifi/contrib/hostapd/eap_mschapv2.c#1 branch .. //depot/projects/wifi/contrib/hostapd/eap_peap.c#1 branch .. //depot/projects/wifi/contrib/hostapd/eap_sim.c#1 branch .. //depot/projects/wifi/contrib/hostapd/eap_sim_common.c#1 branch .. //depot/projects/wifi/contrib/hostapd/eap_sim_common.h#1 branch .. //depot/projects/wifi/contrib/hostapd/eap_sim_db.c#1 branch .. //depot/projects/wifi/contrib/hostapd/eap_sim_db.h#1 branch .. //depot/projects/wifi/contrib/hostapd/eap_tls.c#1 branch .. //depot/projects/wifi/contrib/hostapd/eap_tls_common.c#1 branch .. //depot/projects/wifi/contrib/hostapd/eap_tls_common.h#1 branch .. //depot/projects/wifi/contrib/hostapd/eap_tlv.c#1 branch .. //depot/projects/wifi/contrib/hostapd/eap_ttls.c#1 branch .. //depot/projects/wifi/contrib/hostapd/eap_ttls.h#1 branch .. //depot/projects/wifi/contrib/hostapd/eapol_sm.c#1 branch .. //depot/projects/wifi/contrib/hostapd/eapol_sm.h#1 branch .. //depot/projects/wifi/contrib/hostapd/eloop.c#1 branch .. //depot/projects/wifi/contrib/hostapd/eloop.h#1 branch .. //depot/projects/wifi/contrib/hostapd/hostap_common.h#1 branch .. //depot/projects/wifi/contrib/hostapd/hostapd.accept#1 branch .. //depot/projects/wifi/contrib/hostapd/hostapd.c#1 branch .. //depot/projects/wifi/contrib/hostapd/hostapd.conf#1 branch .. //depot/projects/wifi/contrib/hostapd/hostapd.deny#1 branch .. //depot/projects/wifi/contrib/hostapd/hostapd.eap_user#1 branch .. //depot/projects/wifi/contrib/hostapd/hostapd.h#1 branch .. //depot/projects/wifi/contrib/hostapd/hostapd.radius_clients#1 branch .. //depot/projects/wifi/contrib/hostapd/hostapd.sim_db#1 branch .. //depot/projects/wifi/contrib/hostapd/hostapd.wpa_psk#1 branch .. //depot/projects/wifi/contrib/hostapd/hostapd_cli.c#1 branch .. //depot/projects/wifi/contrib/hostapd/hostapd_ctrl.c#1 branch .. //depot/projects/wifi/contrib/hostapd/hostapd_ctrl.h#1 branch .. //depot/projects/wifi/contrib/hostapd/iapp.c#1 branch .. //depot/projects/wifi/contrib/hostapd/iapp.h#1 branch .. //depot/projects/wifi/contrib/hostapd/ieee802_11.c#1 branch .. //depot/projects/wifi/contrib/hostapd/ieee802_11.h#1 branch .. //depot/projects/wifi/contrib/hostapd/ieee802_11_auth.c#1 branch .. //depot/projects/wifi/contrib/hostapd/ieee802_11_auth.h#1 branch .. //depot/projects/wifi/contrib/hostapd/ieee802_1x.c#1 branch .. //depot/projects/wifi/contrib/hostapd/ieee802_1x.h#1 branch .. //depot/projects/wifi/contrib/hostapd/l2_packet.h#1 branch .. //depot/projects/wifi/contrib/hostapd/madwifi.conf#1 branch .. //depot/projects/wifi/contrib/hostapd/md5.c#1 branch .. //depot/projects/wifi/contrib/hostapd/md5.h#1 branch .. //depot/projects/wifi/contrib/hostapd/ms_funcs.c#1 branch .. //depot/projects/wifi/contrib/hostapd/ms_funcs.h#1 branch .. //depot/projects/wifi/contrib/hostapd/radius.c#1 branch .. //depot/projects/wifi/contrib/hostapd/radius.h#1 branch .. //depot/projects/wifi/contrib/hostapd/radius_client.c#1 branch .. //depot/projects/wifi/contrib/hostapd/radius_client.h#1 branch .. //depot/projects/wifi/contrib/hostapd/radius_server.c#1 branch .. //depot/projects/wifi/contrib/hostapd/radius_server.h#1 branch .. //depot/projects/wifi/contrib/hostapd/rc4.c#1 branch .. //depot/projects/wifi/contrib/hostapd/rc4.h#1 branch .. //depot/projects/wifi/contrib/hostapd/sha1.c#1 branch .. //depot/projects/wifi/contrib/hostapd/sha1.h#1 branch .. //depot/projects/wifi/contrib/hostapd/sta_info.c#1 branch .. //depot/projects/wifi/contrib/hostapd/sta_info.h#1 branch .. //depot/projects/wifi/contrib/hostapd/tls.h#1 branch .. //depot/projects/wifi/contrib/hostapd/tls_none.c#1 branch .. //depot/projects/wifi/contrib/hostapd/tls_openssl.c#1 branch .. //depot/projects/wifi/contrib/hostapd/version.h#1 branch .. //depot/projects/wifi/contrib/hostapd/wired.conf#1 branch .. //depot/projects/wifi/contrib/hostapd/wpa.c#1 branch .. //depot/projects/wifi/contrib/hostapd/wpa.h#1 branch .. //depot/projects/wifi/contrib/libf2c/ChangeLog#2 integrate .. //depot/projects/wifi/contrib/libf2c/libI77/err.c#2 integrate .. //depot/projects/wifi/contrib/libobjc/ChangeLog#2 integrate .. //depot/projects/wifi/contrib/libobjc/gc.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/CHANGES#2 integrate .. //depot/projects/wifi/contrib/libpcap/CREDITS#2 integrate .. //depot/projects/wifi/contrib/libpcap/FILES#2 integrate .. //depot/projects/wifi/contrib/libpcap/INSTALL.txt#2 integrate .. //depot/projects/wifi/contrib/libpcap/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/libpcap/README#2 integrate .. //depot/projects/wifi/contrib/libpcap/README.hpux#2 integrate .. //depot/projects/wifi/contrib/libpcap/README.macosx#1 branch .. //depot/projects/wifi/contrib/libpcap/VERSION#2 integrate .. //depot/projects/wifi/contrib/libpcap/bpf/net/bpf_filter.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/bpf_dump.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/bpf_image.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/config.h.in#2 integrate .. //depot/projects/wifi/contrib/libpcap/configure#2 integrate .. //depot/projects/wifi/contrib/libpcap/configure.in#2 integrate .. //depot/projects/wifi/contrib/libpcap/etherent.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/ethertype.h#2 integrate .. //depot/projects/wifi/contrib/libpcap/fad-getad.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/fad-gifc.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/fad-glifc.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/fad-null.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/fad-win32.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/gencode.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/gencode.h#2 integrate .. //depot/projects/wifi/contrib/libpcap/grammar.y#2 integrate .. //depot/projects/wifi/contrib/libpcap/inet.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/nametoaddr.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/optimize.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-bpf.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-bpf.h#2 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-dag.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-dlpi.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-dos.c#1 branch .. //depot/projects/wifi/contrib/libpcap/pcap-dos.h#1 branch .. //depot/projects/wifi/contrib/libpcap/pcap-enet.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-int.h#2 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-linux.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-namedb.h#2 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-nit.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-null.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-pf.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-snit.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-snoop.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-win32.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/pcap.3#2 integrate .. //depot/projects/wifi/contrib/libpcap/pcap.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/pcap.h#2 integrate .. //depot/projects/wifi/contrib/libpcap/pcap1.h#1 branch .. //depot/projects/wifi/contrib/libpcap/pf.h#2 integrate .. //depot/projects/wifi/contrib/libpcap/ppp.h#2 integrate .. //depot/projects/wifi/contrib/libpcap/savefile.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/scanner.l#2 integrate .. //depot/projects/wifi/contrib/libpcap/snprintf.c#2 delete .. //depot/projects/wifi/contrib/libstdc++/ChangeLog#2 integrate .. //depot/projects/wifi/contrib/libstdc++/ChangeLog-2004#1 branch .. //depot/projects/wifi/contrib/libstdc++/README#2 integrate .. //depot/projects/wifi/contrib/libstdc++/acconfig.h#2 integrate .. //depot/projects/wifi/contrib/libstdc++/acinclude.m4#2 integrate .. //depot/projects/wifi/contrib/libstdc++/aclocal.m4#2 integrate .. //depot/projects/wifi/contrib/libstdc++/config.h.in#2 integrate .. //depot/projects/wifi/contrib/libstdc++/config/abi/alpha-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/wifi/contrib/libstdc++/config/abi/arm-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/wifi/contrib/libstdc++/config/abi/hppa-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/wifi/contrib/libstdc++/config/abi/i386-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/wifi/contrib/libstdc++/config/abi/i486-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/wifi/contrib/libstdc++/config/abi/ia64-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/wifi/contrib/libstdc++/config/abi/m68k-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/wifi/contrib/libstdc++/config/abi/mips-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/wifi/contrib/libstdc++/config/abi/powerpc-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/wifi/contrib/libstdc++/config/abi/s390-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/wifi/contrib/libstdc++/config/abi/s390x-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/wifi/contrib/libstdc++/config/abi/sparc-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/wifi/contrib/libstdc++/config/abi/x86_64-linux-gnu/32/baseline_symbols.txt#1 branch .. //depot/projects/wifi/contrib/libstdc++/config/abi/x86_64-linux-gnu/baseline_symbols.txt#2 integrate .. //depot/projects/wifi/contrib/libstdc++/config/io/basic_file_stdio.cc#2 integrate .. //depot/projects/wifi/contrib/libstdc++/config/io/c_io_stdio.h#2 integrate .. //depot/projects/wifi/contrib/libstdc++/config/linker-map.gnu#2 integrate .. //depot/projects/wifi/contrib/libstdc++/config/locale/generic/c_locale.cc#2 integrate .. //depot/projects/wifi/contrib/libstdc++/config/locale/generic/c_locale.h#2 integrate .. //depot/projects/wifi/contrib/libstdc++/config/locale/generic/time_members.cc#2 integrate .. //depot/projects/wifi/contrib/libstdc++/config/locale/gnu/c_locale.h#2 integrate .. //depot/projects/wifi/contrib/libstdc++/config/locale/gnu/monetary_members.cc#2 integrate .. //depot/projects/wifi/contrib/libstdc++/config/locale/gnu/time_members.cc#2 integrate .. //depot/projects/wifi/contrib/libstdc++/config/locale/ieee_1003.1-2001/codecvt_specializations.h#2 integrate .. //depot/projects/wifi/contrib/libstdc++/configure#2 integrate .. //depot/projects/wifi/contrib/libstdc++/configure.ac#2 integrate .. //depot/projects/wifi/contrib/libstdc++/configure.host#2 integrate .. //depot/projects/wifi/contrib/libstdc++/crossconfig.m4#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/Makefile.am#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/bits/basic_string.h#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/bits/basic_string.tcc#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/bits/boost_concept_check.h#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/bits/c++config#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/bits/fstream.tcc#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/bits/ios_base.h#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/bits/istream.tcc#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/bits/locale_facets.h#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/bits/locale_facets.tcc#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/bits/sstream.tcc#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/bits/stl_algo.h#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/bits/stl_algobase.h#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/bits/stl_list.h#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/bits/stl_tree.h#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/bits/vector.tcc#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/debug/map.h#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/ext/pool_allocator.h#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/ext/rope#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/ext/ropeimpl.h#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/std/std_complex.h#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/std/std_fstream.h#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/std/std_memory.h#2 integrate .. //depot/projects/wifi/contrib/libstdc++/include/std/std_sstream.h#2 integrate .. //depot/projects/wifi/contrib/libstdc++/libsupc++/eh_globals.cc#2 integrate .. //depot/projects/wifi/contrib/libstdc++/linkage.m4#2 integrate .. //depot/projects/wifi/contrib/libstdc++/src/allocator.cc#2 integrate .. //depot/projects/wifi/contrib/libstdc++/src/debug.cc#2 integrate .. //depot/projects/wifi/contrib/libstdc++/src/ios.cc#2 integrate .. //depot/projects/wifi/contrib/libstdc++/src/ios_init.cc#2 integrate .. //depot/projects/wifi/contrib/libstdc++/src/locale_init.cc#2 integrate .. //depot/projects/wifi/contrib/libstdc++/src/localename.cc#2 integrate .. //depot/projects/wifi/contrib/sendmail/FREEBSD-upgrade#3 integrate .. //depot/projects/wifi/contrib/sendmail/RELEASE_NOTES#3 integrate .. //depot/projects/wifi/contrib/sendmail/cf/README#2 integrate .. //depot/projects/wifi/contrib/sendmail/cf/cf/submit.cf#3 integrate .. //depot/projects/wifi/contrib/sendmail/cf/m4/version.m4#3 integrate .. //depot/projects/wifi/contrib/sendmail/doc/op/op.me#2 integrate .. //depot/projects/wifi/contrib/sendmail/include/sm/conf.h#3 integrate .. //depot/projects/wifi/contrib/sendmail/include/sm/sem.h#1 branch .. //depot/projects/wifi/contrib/sendmail/include/sm/shm.h#2 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/Makefile.m4#3 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/ldap.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/sem.c#1 branch .. //depot/projects/wifi/contrib/sendmail/libsm/shm.c#2 integrate .. //depot/projects/wifi/contrib/sendmail/libsm/t-sem.c#1 branch .. //depot/projects/wifi/contrib/sendmail/libsm/t-shm.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/README#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/TRACEFLAGS#2 integrate .. //depot/projects/wifi/contrib/sendmail/src/collect.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/conf.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/daemon.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/deliver.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/domain.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/envelope.c#2 integrate .. //depot/projects/wifi/contrib/sendmail/src/map.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/mci.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/milter.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/parseaddr.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/queue.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/sendmail.h#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/srvrsmtp.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/tls.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/usersmtp.c#3 integrate .. //depot/projects/wifi/contrib/sendmail/src/version.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/.cvsignore#2 integrate .. //depot/projects/wifi/contrib/tcpdump/CHANGES#2 integrate .. //depot/projects/wifi/contrib/tcpdump/CREDITS#2 integrate .. //depot/projects/wifi/contrib/tcpdump/FILES#2 integrate .. //depot/projects/wifi/contrib/tcpdump/INSTALL#2 integrate .. //depot/projects/wifi/contrib/tcpdump/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/tcpdump/README#2 integrate .. //depot/projects/wifi/contrib/tcpdump/VERSION#2 integrate .. //depot/projects/wifi/contrib/tcpdump/acconfig.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/addrtoname.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/appletalk.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/bgp.h#1 branch .. //depot/projects/wifi/contrib/tcpdump/bpf_dump.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/config.h.in#2 integrate .. //depot/projects/wifi/contrib/tcpdump/configure#2 integrate .. //depot/projects/wifi/contrib/tcpdump/configure.in#2 integrate .. //depot/projects/wifi/contrib/tcpdump/cpack.c#1 branch .. //depot/projects/wifi/contrib/tcpdump/cpack.h#1 branch .. //depot/projects/wifi/contrib/tcpdump/decode_prefix.h#1 branch .. //depot/projects/wifi/contrib/tcpdump/ethertype.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/extract.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/gmpls.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/gmpls.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/gmt2local.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/icmp6.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/ieee802_11_radio.h#1 branch .. //depot/projects/wifi/contrib/tcpdump/interface.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/ip.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/ipproto.c#1 branch .. //depot/projects/wifi/contrib/tcpdump/ipproto.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/l2vpn.c#1 branch .. //depot/projects/wifi/contrib/tcpdump/l2vpn.h#1 branch .. //depot/projects/wifi/contrib/tcpdump/llc.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/machdep.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/missing/bittypes.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/missing/datalinks.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/missing/dlnames.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/missing/getaddrinfo.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/missing/getnameinfo.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/missing/inet_aton.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/missing/inet_ntop.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/missing/inet_pton.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/missing/snprintf.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/missing/strlcat.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/missing/strlcpy.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/mpls.h#1 branch .. //depot/projects/wifi/contrib/tcpdump/netdissect.h#1 branch .. //depot/projects/wifi/contrib/tcpdump/nlpid.c#1 branch .. //depot/projects/wifi/contrib/tcpdump/nlpid.h#1 branch .. //depot/projects/wifi/contrib/tcpdump/ntp.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/ospf.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/oui.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/oui.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/parsenfsfh.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/pcap-missing.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/pf.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/pmap_prot.h#1 branch .. //depot/projects/wifi/contrib/tcpdump/ppp.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-802_11.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-ah.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-aodv.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-ap1394.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-arcnet.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-arp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-ascii.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-atalk.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-atm.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-beep.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-bfd.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-bgp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-bootp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-cdp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-chdlc.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-cip.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-cnfp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-decnet.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-dhcp6.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-domain.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-dvmrp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-eap.c#1 branch .. //depot/projects/wifi/contrib/tcpdump/print-egp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-eigrp.c#1 branch .. //depot/projects/wifi/contrib/tcpdump/print-enc.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-esp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-ether.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-fddi.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-fr.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-frag6.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-gre.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-hsrp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-icmp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-icmp6.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-igmp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-igrp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-ip.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-ip6.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-ip6opts.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-ipcomp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-ipfc.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-ipx.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-isakmp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-isoclns.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-juniper.c#1 branch .. //depot/projects/wifi/contrib/tcpdump/print-krb.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-l2tp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-lane.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-ldp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-llc.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-lmp.c#1 branch .. //depot/projects/wifi/contrib/tcpdump/print-lspping.c#1 branch .. //depot/projects/wifi/contrib/tcpdump/print-lwres.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-mobile.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-mobility.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-mpls.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-msdp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-netbios.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-nfs.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-ntp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-null.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-ospf.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-ospf6.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-pflog.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-pim.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-ppp.c#3 integrate .. //depot/projects/wifi/contrib/tcpdump/print-pppoe.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-pptp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-radius.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-raw.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-rip.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-ripng.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-rsvp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-rt6.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-rx.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-sctp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-sip.c#1 branch .. //depot/projects/wifi/contrib/tcpdump/print-sl.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-sll.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-smb.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-snmp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-stp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-sunatm.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-sunrpc.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-symantec.c#1 branch .. //depot/projects/wifi/contrib/tcpdump/print-syslog.c#1 branch .. //depot/projects/wifi/contrib/tcpdump/print-tcp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-telnet.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-tftp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-timed.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-token.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-udp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-vjc.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-vrrp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-wb.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-zephyr.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/rpc_auth.h#1 branch .. //depot/projects/wifi/contrib/tcpdump/rpc_msg.h#1 branch .. //depot/projects/wifi/contrib/tcpdump/setsignal.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/smb.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/smbutil.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/strcasecmp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/tcp.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/tcpdump-stdinc.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/tcpdump.1#2 integrate .. //depot/projects/wifi/contrib/tcpdump/tcpdump.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/udp.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/util.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/vfprintf.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/COPYING#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/ChangeLog#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/FREEBSD-Xlist#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/FREEBSD-upgrade#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/Makefile#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/README#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/aes.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/aes_wrap.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/aes_wrap.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/common.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/common.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/config.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/config.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/config_ssid.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/crypto.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/crypto.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/ctrl_iface.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/ctrl_iface.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/defconfig#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/defs.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/developer.txt#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/doc/wpa_supplicant.fig#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/driver.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/drivers.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_aka.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_defs.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_fast.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_gtc.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_i.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_leap.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_md5.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_mschapv2.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_otp.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_peap.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_psk.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_sim.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_sim_common.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_sim_common.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_testing.txt#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_tls.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_tls_common.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_tls_common.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_tlv.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_tlv.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_ttls.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eap_ttls.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eapol_sm.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eapol_sm.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eapol_test.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eloop.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/eloop.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/hostap_common.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/l2_packet.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/md5.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/md5.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/ms_funcs.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/ms_funcs.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/openssl-tls-extensions.patch#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/pcsc_funcs.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/pcsc_funcs.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/preauth_test.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/radius_client.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/radius_client.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/rc4.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/rc4.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/sha1.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/sha1.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/tls.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/tls_none.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/tls_openssl.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/todo.txt#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/version.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_cli.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_ctrl.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_ctrl.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_passphrase.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_supplicant.c#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_supplicant.conf#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_supplicant.h#1 branch .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_supplicant_i.h#1 branch .. //depot/projects/wifi/crypto/openssh/ChangeLog#3 integrate .. //depot/projects/wifi/crypto/openssh/FREEBSD-tricks#2 integrate .. //depot/projects/wifi/crypto/openssh/FREEBSD-upgrade#3 integrate .. //depot/projects/wifi/crypto/openssh/INSTALL#3 integrate .. //depot/projects/wifi/crypto/openssh/LICENCE#2 integrate .. //depot/projects/wifi/crypto/openssh/Makefile.in#3 integrate .. //depot/projects/wifi/crypto/openssh/README#3 integrate .. //depot/projects/wifi/crypto/openssh/README.platform#3 integrate .. //depot/projects/wifi/crypto/openssh/README.privsep#3 integrate .. //depot/projects/wifi/crypto/openssh/TODO#2 integrate .. //depot/projects/wifi/crypto/openssh/WARNING.RNG#2 integrate .. //depot/projects/wifi/crypto/openssh/acconfig.h#3 integrate .. //depot/projects/wifi/crypto/openssh/audit-bsm.c#1 branch .. //depot/projects/wifi/crypto/openssh/audit.c#1 branch .. //depot/projects/wifi/crypto/openssh/audit.h#1 branch .. //depot/projects/wifi/crypto/openssh/auth-bsdauth.c#2 integrate .. //depot/projects/wifi/crypto/openssh/auth-chall.c#2 integrate .. //depot/projects/wifi/crypto/openssh/auth-krb5.c#3 integrate .. //depot/projects/wifi/crypto/openssh/auth-options.c#2 integrate .. //depot/projects/wifi/crypto/openssh/auth-pam.c#3 integrate .. //depot/projects/wifi/crypto/openssh/auth-pam.h#3 integrate .. //depot/projects/wifi/crypto/openssh/auth-passwd.c#3 integrate .. //depot/projects/wifi/crypto/openssh/auth-rsa.c#3 integrate .. //depot/projects/wifi/crypto/openssh/auth-shadow.c#2 integrate .. //depot/projects/wifi/crypto/openssh/auth-sia.c#2 integrate .. //depot/projects/wifi/crypto/openssh/auth-sia.h#2 integrate .. //depot/projects/wifi/crypto/openssh/auth.c#3 integrate .. //depot/projects/wifi/crypto/openssh/auth.h#3 integrate .. //depot/projects/wifi/crypto/openssh/auth1.c#3 integrate .. //depot/projects/wifi/crypto/openssh/auth2-chall.c#3 integrate .. //depot/projects/wifi/crypto/openssh/auth2-kbdint.c#2 integrate .. //depot/projects/wifi/crypto/openssh/auth2-none.c#3 integrate .. //depot/projects/wifi/crypto/openssh/auth2-passwd.c#2 integrate .. //depot/projects/wifi/crypto/openssh/auth2-pubkey.c#3 integrate .. //depot/projects/wifi/crypto/openssh/auth2.c#3 integrate .. //depot/projects/wifi/crypto/openssh/authfile.c#3 integrate .. //depot/projects/wifi/crypto/openssh/bufaux.c#2 integrate .. //depot/projects/wifi/crypto/openssh/bufaux.h#2 integrate .. //depot/projects/wifi/crypto/openssh/buffer.c#2 integrate .. //depot/projects/wifi/crypto/openssh/buffer.h#2 integrate .. //depot/projects/wifi/crypto/openssh/buildpkg.sh.in#2 integrate .. //depot/projects/wifi/crypto/openssh/canohost.c#3 integrate .. //depot/projects/wifi/crypto/openssh/canohost.h#2 integrate .. //depot/projects/wifi/crypto/openssh/channels.c#3 integrate .. //depot/projects/wifi/crypto/openssh/channels.h#3 integrate .. //depot/projects/wifi/crypto/openssh/cipher-ctr.c#2 integrate .. //depot/projects/wifi/crypto/openssh/cipher.c#3 integrate .. //depot/projects/wifi/crypto/openssh/clientloop.c#3 integrate .. //depot/projects/wifi/crypto/openssh/clientloop.h#3 integrate .. //depot/projects/wifi/crypto/openssh/compat.c#2 integrate .. //depot/projects/wifi/crypto/openssh/compat.h#3 integrate .. //depot/projects/wifi/crypto/openssh/config.guess#3 integrate .. //depot/projects/wifi/crypto/openssh/config.h#3 integrate .. //depot/projects/wifi/crypto/openssh/configure.ac#3 integrate .. //depot/projects/wifi/crypto/openssh/defines.h#3 integrate .. //depot/projects/wifi/crypto/openssh/hostfile.c#2 integrate .. //depot/projects/wifi/crypto/openssh/hostfile.h#2 integrate .. //depot/projects/wifi/crypto/openssh/includes.h#3 integrate .. //depot/projects/wifi/crypto/openssh/key.c#3 integrate .. //depot/projects/wifi/crypto/openssh/log.c#3 integrate .. //depot/projects/wifi/crypto/openssh/loginrec.c#3 integrate .. //depot/projects/wifi/crypto/openssh/loginrec.h#2 integrate .. //depot/projects/wifi/crypto/openssh/misc.c#3 integrate .. //depot/projects/wifi/crypto/openssh/misc.h#3 integrate .. //depot/projects/wifi/crypto/openssh/moduli#2 integrate .. //depot/projects/wifi/crypto/openssh/moduli.c#3 integrate .. //depot/projects/wifi/crypto/openssh/monitor.c#3 integrate .. //depot/projects/wifi/crypto/openssh/monitor.h#2 integrate .. //depot/projects/wifi/crypto/openssh/monitor_mm.c#3 integrate .. //depot/projects/wifi/crypto/openssh/monitor_wrap.c#3 integrate .. //depot/projects/wifi/crypto/openssh/monitor_wrap.h#3 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/bsd-arc4random.c#3 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/bsd-cray.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/bsd-cray.h#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/bsd-cygwin_util.h#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/bsd-misc.c#3 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/bsd-misc.h#3 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/bsd-openpty.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/bsd-snprintf.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/fake-rfc2553.h#3 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/getrrsetbyname.c#3 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/inet_ntop.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/mktemp.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/port-aix.c#3 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/port-aix.h#3 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/readpassphrase.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/realpath.c#2 integrate .. //depot/projects/wifi/crypto/openssh/openbsd-compat/xmmap.c#3 integrate .. //depot/projects/wifi/crypto/openssh/packet.c#3 integrate .. //depot/projects/wifi/crypto/openssh/readconf.c#3 integrate .. //depot/projects/wifi/crypto/openssh/readconf.h#3 integrate .. //depot/projects/wifi/crypto/openssh/readpass.c#3 integrate .. //depot/projects/wifi/crypto/openssh/regress/Makefile#3 integrate .. //depot/projects/wifi/crypto/openssh/regress/agent-ptrace.sh#2 integrate .. //depot/projects/wifi/crypto/openssh/regress/brokenkeys.sh#1 branch .. //depot/projects/wifi/crypto/openssh/regress/dynamic-forward.sh#3 integrate .. //depot/projects/wifi/crypto/openssh/regress/envpass.sh#2 integrate .. //depot/projects/wifi/crypto/openssh/regress/login-timeout.sh#3 integrate .. //depot/projects/wifi/crypto/openssh/regress/multiplex.sh#2 integrate .. //depot/projects/wifi/crypto/openssh/regress/reexec.sh#2 integrate .. //depot/projects/wifi/crypto/openssh/regress/rekey.sh#2 integrate .. //depot/projects/wifi/crypto/openssh/regress/scp.sh#2 integrate .. //depot/projects/wifi/crypto/openssh/regress/sftp-glob.sh#1 branch .. //depot/projects/wifi/crypto/openssh/regress/sshd-log-wrapper.sh#1 branch .. //depot/projects/wifi/crypto/openssh/regress/test-exec.sh#3 integrate .. //depot/projects/wifi/crypto/openssh/scp.1#3 integrate .. //depot/projects/wifi/crypto/openssh/scp.c#3 integrate .. //depot/projects/wifi/crypto/openssh/servconf.c#3 integrate .. //depot/projects/wifi/crypto/openssh/servconf.h#3 integrate .. //depot/projects/wifi/crypto/openssh/session.c#3 integrate .. //depot/projects/wifi/crypto/openssh/sftp-client.c#3 integrate .. //depot/projects/wifi/crypto/openssh/sftp-client.h#2 integrate .. //depot/projects/wifi/crypto/openssh/sftp.1#3 integrate .. //depot/projects/wifi/crypto/openssh/sftp.c#3 integrate .. //depot/projects/wifi/crypto/openssh/ssh-add.1#2 integrate .. //depot/projects/wifi/crypto/openssh/ssh-add.c#3 integrate .. //depot/projects/wifi/crypto/openssh/ssh-agent.c#3 integrate .. //depot/projects/wifi/crypto/openssh/ssh-keygen.1#3 integrate .. //depot/projects/wifi/crypto/openssh/ssh-keygen.c#3 integrate .. //depot/projects/wifi/crypto/openssh/ssh-keyscan.1#3 integrate .. //depot/projects/wifi/crypto/openssh/ssh-keyscan.c#3 integrate .. //depot/projects/wifi/crypto/openssh/ssh-keysign.c#3 integrate .. //depot/projects/wifi/crypto/openssh/ssh-rand-helper.c#3 integrate .. //depot/projects/wifi/crypto/openssh/ssh.1#3 integrate .. //depot/projects/wifi/crypto/openssh/ssh.c#3 integrate .. //depot/projects/wifi/crypto/openssh/ssh.h#2 integrate .. //depot/projects/wifi/crypto/openssh/ssh1.h#3 integrate .. //depot/projects/wifi/crypto/openssh/ssh_config#3 integrate .. //depot/projects/wifi/crypto/openssh/ssh_config.5#3 integrate .. //depot/projects/wifi/crypto/openssh/sshconnect.c#3 integrate .. //depot/projects/wifi/crypto/openssh/sshd.8#3 integrate .. //depot/projects/wifi/crypto/openssh/sshd.c#3 integrate .. //depot/projects/wifi/crypto/openssh/sshd_config#3 integrate .. //depot/projects/wifi/crypto/openssh/sshd_config.5#3 integrate .. //depot/projects/wifi/crypto/openssh/survey.sh.in#1 branch .. //depot/projects/wifi/crypto/openssh/uidswap.c#2 integrate .. //depot/projects/wifi/crypto/openssh/version.h#3 integrate .. //depot/projects/wifi/etc/defaults/rc.conf#15 integrate .. //depot/projects/wifi/etc/devd.conf#9 integrate .. //depot/projects/wifi/etc/ftpusers#2 integrate .. //depot/projects/wifi/etc/group#2 integrate .. //depot/projects/wifi/etc/mail/aliases#2 integrate .. //depot/projects/wifi/etc/master.passwd#3 integrate .. //depot/projects/wifi/etc/mtree/BSD.include.dist#7 integrate .. //depot/projects/wifi/etc/mtree/BSD.root.dist#2 integrate .. //depot/projects/wifi/etc/network.subr#4 integrate .. //depot/projects/wifi/etc/pccard_ether#6 integrate .. //depot/projects/wifi/etc/rc.d/altqd#2 delete .. //depot/projects/wifi/etc/rc.d/dhclient#5 integrate .. //depot/projects/wifi/etc/rc.d/dhcpd#2 delete .. //depot/projects/wifi/etc/rc.d/dhcrelay#2 delete .. //depot/projects/wifi/etc/rc.d/downinterfaces#2 delete .. //depot/projects/wifi/etc/rc.d/dumpon#3 integrate .. //depot/projects/wifi/etc/rc.d/gated#2 delete .. //depot/projects/wifi/etc/rc.d/ifwatchd#2 delete .. //depot/projects/wifi/etc/rc.d/kdc#2 delete .. //depot/projects/wifi/etc/rc.d/lkm1#2 delete .. //depot/projects/wifi/etc/rc.d/lkm2#2 delete .. //depot/projects/wifi/etc/rc.d/lkm3#2 delete .. //depot/projects/wifi/etc/rc.d/mixerctl#2 delete .. //depot/projects/wifi/etc/rc.d/mopd#2 delete .. //depot/projects/wifi/etc/rc.d/mountall#2 delete .. //depot/projects/wifi/etc/rc.d/ndbootd#2 delete .. //depot/projects/wifi/etc/rc.d/netif#3 integrate .. //depot/projects/wifi/etc/rc.d/network#2 delete .. //depot/projects/wifi/etc/rc.d/poffd#2 delete .. //depot/projects/wifi/etc/rc.d/postfix#2 delete .. //depot/projects/wifi/etc/rc.d/ppp#2 delete .. //depot/projects/wifi/etc/rc.d/racoon#2 delete .. //depot/projects/wifi/etc/rc.d/raidframe#2 delete .. //depot/projects/wifi/etc/rc.d/rbootd#2 delete .. //depot/projects/wifi/etc/rc.d/rtsold#2 delete .. //depot/projects/wifi/etc/rc.d/screenblank#2 delete .. //depot/projects/wifi/etc/rc.d/swap2#2 delete .. //depot/projects/wifi/etc/rc.d/sysdb#2 delete .. //depot/projects/wifi/etc/rc.d/wscons#2 delete .. //depot/projects/wifi/etc/rc.d/xdm#2 delete .. //depot/projects/wifi/etc/rc.d/xfs#2 delete .. //depot/projects/wifi/games/fortune/datfiles/fortunes#13 integrate .. //depot/projects/wifi/games/morse/morse.6#3 integrate .. //depot/projects/wifi/games/morse/morse.c#2 integrate .. //depot/projects/wifi/games/random/random.c#3 integrate .. //depot/projects/wifi/gnu/usr.bin/cc/cc_tools/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/cvs/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/cvs/contrib/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/cvs/cvs/Makefile#3 integrate .. //depot/projects/wifi/gnu/usr.bin/cvs/cvsbug/Makefile#3 integrate .. //depot/projects/wifi/gnu/usr.bin/cvs/doc/Makefile#2 integrate .. //depot/projects/wifi/gnu/usr.bin/cvs/lib/Makefile#3 integrate .. //depot/projects/wifi/gnu/usr.bin/cvs/libdiff/Makefile#3 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/arch/i386/config.h#3 integrate .. //depot/projects/wifi/gnu/usr.bin/gdb/libgdb/fbsd-threads.c#7 integrate .. //depot/projects/wifi/gnu/usr.bin/grep/search.c#3 integrate .. //depot/projects/wifi/include/Makefile#12 integrate .. //depot/projects/wifi/include/netdb.h#6 integrate .. //depot/projects/wifi/include/proc_service.h#2 integrate .. //depot/projects/wifi/include/pthread.h#4 integrate .. //depot/projects/wifi/lib/libarchive/Makefile#11 integrate .. //depot/projects/wifi/lib/libarchive/archive.h.in#5 integrate .. //depot/projects/wifi/lib/libarchive/archive_entry.c#5 integrate .. //depot/projects/wifi/lib/libarchive/archive_entry.h#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_platform.h#5 integrate .. //depot/projects/wifi/lib/libarchive/archive_private.h#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_read.c#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_data_into_fd.c#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_extract.c#7 integrate .. //depot/projects/wifi/lib/libarchive/archive_write.3#5 integrate .. //depot/projects/wifi/lib/libarchive/archive_write.c#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_compression_bzip2.c#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_compression_gzip.c#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_compression_none.c#3 integrate .. //depot/projects/wifi/lib/libarchive/archive_write_set_format_pax.c#8 integrate .. //depot/projects/wifi/lib/libarchive/configure.ac.in#5 integrate .. //depot/projects/wifi/lib/libc/net/getnetbydns.c#4 integrate .. //depot/projects/wifi/lib/libc/net/getnetbyht.c#5 integrate .. //depot/projects/wifi/lib/libc/net/getnetbynis.c#4 integrate .. //depot/projects/wifi/lib/libc/net/getnetent.3#3 integrate .. //depot/projects/wifi/lib/libc/net/getnetnamadr.c#4 integrate .. //depot/projects/wifi/lib/libc/net/name6.c#8 integrate .. //depot/projects/wifi/lib/libc/posix1e/Makefile.inc#2 integrate .. //depot/projects/wifi/lib/libc/sparc64/fpu/fpu_explode.c#2 integrate .. //depot/projects/wifi/lib/libc/sparc64/fpu/fpu_qp.c#2 integrate .. //depot/projects/wifi/lib/libc/sys/kqueue.2#2 integrate .. //depot/projects/wifi/lib/libc_r/uthread/pthread_private.h#6 integrate .. //depot/projects/wifi/lib/libc_r/uthread/uthread_exit.c#2 integrate .. //depot/projects/wifi/lib/libpam/modules/pam_ssh/Makefile#2 integrate .. //depot/projects/wifi/lib/libpcap/Makefile#3 integrate .. //depot/projects/wifi/lib/libpcap/config.h#3 integrate .. //depot/projects/wifi/lib/libpthread/arch/alpha/alpha/enter_uts.S#2 integrate .. //depot/projects/wifi/lib/librpcsvc/Makefile#5 integrate .. //depot/projects/wifi/lib/librpcsvc/xcrypt.c#2 integrate .. //depot/projects/wifi/lib/libsdp/sdp.3#3 integrate .. //depot/projects/wifi/lib/libsdp/sdp.h#2 integrate .. //depot/projects/wifi/lib/libsdp/util.c#2 integrate .. //depot/projects/wifi/lib/libsm/Makefile#5 integrate .. //depot/projects/wifi/lib/libstand/Makefile#5 integrate .. //depot/projects/wifi/lib/libstand/net.c#2 integrate .. //depot/projects/wifi/lib/libstand/udp.c#2 integrate .. //depot/projects/wifi/lib/libstand/zalloc_defs.h#2 integrate .. //depot/projects/wifi/lib/libthread_db/arch/i386/libpthread_md.c#2 integrate .. //depot/projects/wifi/lib/libthread_db/libc_r_db.c#3 integrate .. //depot/projects/wifi/lib/libthread_db/libpthread_db.c#5 integrate .. //depot/projects/wifi/lib/libthread_db/libpthread_db.h#2 integrate .. //depot/projects/wifi/lib/libthread_db/libthr_db.c#6 integrate .. //depot/projects/wifi/lib/libthread_db/thread_db.c#2 integrate .. //depot/projects/wifi/lib/libthread_db/thread_db.h#4 integrate .. //depot/projects/wifi/lib/libthread_db/thread_db_int.h#2 integrate .. //depot/projects/wifi/lib/libusbhid/Makefile#2 integrate .. //depot/projects/wifi/lib/libz/Makefile#2 integrate .. //depot/projects/wifi/libexec/getty/ttys.5#4 integrate .. //depot/projects/wifi/libexec/rtld-elf/alpha/reloc.c#2 integrate .. //depot/projects/wifi/libexec/rtld-elf/sparc64/reloc.c#2 integrate .. //depot/projects/wifi/libexec/tftpd/tftpd.c#4 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#15 integrate .. //depot/projects/wifi/rescue/rescue/Makefile#13 integrate .. //depot/projects/wifi/sbin/Makefile#8 integrate .. //depot/projects/wifi/sbin/atacontrol/atacontrol.c#4 integrate .. //depot/projects/wifi/sbin/clri/clri.c#2 integrate .. //depot/projects/wifi/sbin/dhclient/Makefile#4 integrate .. //depot/projects/wifi/sbin/ifconfig/Makefile#7 integrate .. //depot/projects/wifi/sbin/ifconfig/ifbridge.c#1 branch .. //depot/projects/wifi/sbin/ifconfig/ifconfig.8#8 integrate .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#39 integrate .. //depot/projects/wifi/sbin/ipfw/ipfw.8#12 integrate .. //depot/projects/wifi/sbin/ipfw/ipfw2.c#11 integrate .. //depot/projects/wifi/sbin/mount/mntopts.h#4 integrate .. //depot/projects/wifi/sbin/mount/mount_ufs.c#2 integrate .. //depot/projects/wifi/sbin/mount_cd9660/mount_cd9660.c#3 integrate .. //depot/projects/wifi/sbin/mount_ext2fs/mount_ext2fs.c#2 integrate .. //depot/projects/wifi/sbin/mount_hpfs/mount_hpfs.c#2 integrate .. //depot/projects/wifi/sbin/mount_msdosfs/mount_msdosfs.c#2 integrate .. //depot/projects/wifi/sbin/mount_nfs/mount_nfs.c#3 integrate .. //depot/projects/wifi/sbin/mount_nfs4/mount_nfs4.c#3 integrate .. //depot/projects/wifi/sbin/mount_ntfs/mount_ntfs.c#3 integrate .. //depot/projects/wifi/sbin/mount_nullfs/mount_nullfs.c#3 integrate .. //depot/projects/wifi/sbin/mount_reiserfs/mount_reiserfs.c#2 integrate .. //depot/projects/wifi/sbin/mount_std/mount_std.c#2 integrate .. //depot/projects/wifi/sbin/mount_udf/mount_udf.c#2 integrate .. //depot/projects/wifi/sbin/mount_ufs/mount_ufs.c#3 integrate .. //depot/projects/wifi/sbin/mount_umapfs/mount_umapfs.c#3 integrate .. //depot/projects/wifi/sbin/mount_unionfs/mount_unionfs.c#3 integrate .. //depot/projects/wifi/sbin/restore/interactive.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 15 01:26:20 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D1F0116A420; Fri, 15 Jul 2005 01:26:19 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8D3AF16A41F for ; Fri, 15 Jul 2005 01:26:19 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F07AD43D46 for ; Fri, 15 Jul 2005 01:26:18 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6F1QI6L048705 for ; Fri, 15 Jul 2005 01:26:18 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6F1QIkJ048702 for perforce@freebsd.org; Fri, 15 Jul 2005 01:26:18 GMT (envelope-from sam@freebsd.org) Date: Fri, 15 Jul 2005 01:26:18 GMT Message-Id: <200507150126.j6F1QIkJ048702@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 80222 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2005 01:26:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=80222 Change 80222 by sam@sam_ebb on 2005/07/15 01:25:18 reintegrate after cleanup Affected files ... .. //depot/projects/wifi/contrib/hostapd/ChangeLog#2 integrate .. //depot/projects/wifi/contrib/hostapd/Makefile#2 integrate .. //depot/projects/wifi/contrib/hostapd/common.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/config.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/ctrl_iface.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/eapol_sm.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/eapol_sm.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/ieee802_1x.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/ms_funcs.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/radius_client.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/radius_server.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/tls_openssl.c#2 integrate .. //depot/projects/wifi/contrib/hostapd/version.h#2 integrate .. //depot/projects/wifi/contrib/hostapd/wpa.c#2 integrate .. //depot/projects/wifi/contrib/libpcap/pcap-dos.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/ipproto.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/pmap_prot.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-eigrp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-juniper.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-lmp.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/print-lspping.c#2 integrate .. //depot/projects/wifi/contrib/tcpdump/rpc_auth.h#2 integrate .. //depot/projects/wifi/contrib/tcpdump/rpc_msg.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/ChangeLog#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/README#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/config.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/ctrl_iface.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_mschapv2.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_peap.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_tls_common.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eap_ttls.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/eapol_sm.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/ms_funcs.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/tls_openssl.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/version.h#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_ctrl.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_supplicant.c#2 integrate .. //depot/projects/wifi/contrib/wpa_supplicant/wpa_supplicant_i.h#2 integrate .. //depot/projects/wifi/share/man/man4/if_bridge.4#2 integrate .. //depot/projects/wifi/sys/dev/kbd/atkbdc.c#4 delete .. //depot/projects/wifi/sys/dev/mpt/mpt_freebsd.h#4 delete .. //depot/projects/wifi/sys/i386/i386/ptrace_machdep.c#2 integrate .. //depot/projects/wifi/sys/isa/atkbdc_isa.c#3 delete .. //depot/projects/wifi/sys/net/bridgestp.c#2 integrate .. //depot/projects/wifi/sys/net/if_bridge.c#2 integrate .. //depot/projects/wifi/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/wifi/usr.sbin/wpa/hostapd/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/wpa/hostapd/driver_freebsd.c#2 integrate .. //depot/projects/wifi/usr.sbin/wpa/hostapd/hostapd.1#2 delete .. //depot/projects/wifi/usr.sbin/wpa/hostapd_cli/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/wpa/hostapd_cli/hostapd_cli.1#2 delete .. //depot/projects/wifi/usr.sbin/wpa/wpa_cli/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/wpa/wpa_cli/wpa_cli.1#2 delete .. //depot/projects/wifi/usr.sbin/wpa/wpa_supplicant/Makefile#2 integrate .. //depot/projects/wifi/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#2 integrate .. //depot/projects/wifi/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.1#2 delete .. //depot/projects/wifi/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#2 integrate Differences ... ==== //depot/projects/wifi/contrib/hostapd/ChangeLog#2 (text+ko) ==== @@ -1,5 +1,19 @@ ChangeLog for hostapd +2005-06-10 - v0.3.9 + * fixed a bug which caused some RSN pre-authentication cases to use + freed memory and potentially crash hostapd + * fixed private key loading for cases where passphrase is not set + * fixed WPA2 to add PMKSA cache entry when using integrated EAP + authenticator + * driver_madwifi: fixed pairwise key removal to allow WPA reauth + without disassociation + * fixed RADIUS attribute Class processing to only use Access-Accept + packets to update Class; previously, other RADIUS authentication + packets could have cleared Class attribute + * fixed PMKSA caching (EAP authentication was not skipped correctly + with the new state machine changes from IEEE 802.1X draft) + 2005-02-12 - v0.3.7 (beginning of 0.3.x stable releases) 2005-01-23 - v0.3.5 ==== //depot/projects/wifi/contrib/hostapd/Makefile#2 (text+ko) ==== @@ -228,6 +228,6 @@ $(CC) -o hostapd_cli hostapd_cli.o hostapd_ctrl.o clean: - rm -f core *~ *.o hostapd *.d driver_conf.c + rm -f core *~ *.o hostapd hostapd_cli *.d driver_conf.c -include $(OBJS:%.o=%.d) ==== //depot/projects/wifi/contrib/hostapd/common.h#2 (text+ko) ==== @@ -8,8 +8,12 @@ #ifdef __FreeBSD__ #include #include +#define __BYTE_ORDER _BYTE_ORDER +#define __LITTLE_ENDIAN _LITTLE_ENDIAN +#define __BIG_ENDIAN _BIG_ENDIAN #define bswap_16 bswap16 #define bswap_32 bswap32 +#define bswap_64 bswap64 #endif #ifdef CONFIG_NATIVE_WINDOWS ==== //depot/projects/wifi/contrib/hostapd/config.c#2 (text+ko) ==== @@ -597,7 +597,8 @@ } if (conf->wpa && (conf->wpa_key_mgmt & WPA_KEY_MGMT_PSK) && - conf->wpa_psk == NULL && conf->wpa_passphrase == NULL) { + conf->wpa_psk == NULL && conf->wpa_passphrase == NULL && + conf->wpa_psk_file == NULL) { printf("WPA-PSK enabled, but PSK or passphrase is not " "configured.\n"); return -1; ==== //depot/projects/wifi/contrib/hostapd/ctrl_iface.c#2 (text+ko) ==== @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -383,7 +384,8 @@ unlink(fname); free(fname); - if (rmdir(hapd->conf->ctrl_interface) < 0) { + if (hapd->conf->ctrl_interface && + rmdir(hapd->conf->ctrl_interface) < 0) { if (errno == ENOTEMPTY) { wpa_printf(MSG_DEBUG, "Control interface " "directory not empty - leaving it " ==== //depot/projects/wifi/contrib/hostapd/eapol_sm.c#2 (text+ko) ==== @@ -12,7 +12,7 @@ * * See README and COPYING for more details. * - * $FreeBSD: src/contrib/hostapd/eapol_sm.c,v 1.2 2005/06/05 22:41:14 sam Exp $ + * $FreeBSD: src/contrib/hostapd/eapol_sm.c,v 1.3 2005/06/13 17:07:31 sam Exp $ */ #include @@ -767,22 +767,22 @@ prev_ctrl_dir = sm->ctrl_dir.state; SM_STEP_RUN(AUTH_PAE); - if (!eapol_sm_sta_entry_alive(hapd, addr)) + if (!sm->initializing && !eapol_sm_sta_entry_alive(hapd, addr)) break; SM_STEP_RUN(BE_AUTH); - if (!eapol_sm_sta_entry_alive(hapd, addr)) + if (!sm->initializing && !eapol_sm_sta_entry_alive(hapd, addr)) break; SM_STEP_RUN(REAUTH_TIMER); - if (!eapol_sm_sta_entry_alive(hapd, addr)) + if (!sm->initializing && !eapol_sm_sta_entry_alive(hapd, addr)) break; SM_STEP_RUN(AUTH_KEY_TX); - if (!eapol_sm_sta_entry_alive(hapd, addr)) + if (!sm->initializing && !eapol_sm_sta_entry_alive(hapd, addr)) break; SM_STEP_RUN(KEY_RX); - if (!eapol_sm_sta_entry_alive(hapd, addr)) + if (!sm->initializing && !eapol_sm_sta_entry_alive(hapd, addr)) break; SM_STEP_RUN(CTRL_DIR); - if (!eapol_sm_sta_entry_alive(hapd, addr)) + if (!sm->initializing && !eapol_sm_sta_entry_alive(hapd, addr)) break; } while (prev_auth_pae != sm->auth_pae.state || prev_be_auth != sm->be_auth.state || @@ -803,12 +803,14 @@ void eapol_sm_initialize(struct eapol_state_machine *sm) { + sm->initializing = TRUE; /* Initialize the state machines by asserting initialize and then * deasserting it after one step */ sm->initialize = TRUE; eapol_sm_step(sm); sm->initialize = FALSE; eapol_sm_step(sm); + sm->initializing = FALSE; /* Start one second tick for port timers state machine */ eloop_cancel_timeout(eapol_port_timers_tick, sm->hapd, sm); ==== //depot/projects/wifi/contrib/hostapd/eapol_sm.h#2 (text+ko) ==== @@ -195,6 +195,8 @@ */ u8 currentId; + Boolean initializing; /* in process of initializing state machines */ + /* Somewhat nasty pointers to global hostapd and STA data to avoid * passing these to every function */ struct hostapd_data *hapd; ==== //depot/projects/wifi/contrib/hostapd/ieee802_1x.c#2 (text+ko) ==== @@ -12,7 +12,7 @@ * * See README and COPYING for more details. * - * $FreeBSD: src/contrib/hostapd/ieee802_1x.c,v 1.2 2005/06/05 22:41:14 sam Exp $ + * $FreeBSD: src/contrib/hostapd/ieee802_1x.c,v 1.3 2005/06/13 17:07:31 sam Exp $ */ #include @@ -1157,6 +1157,7 @@ session_timeout_set ? session_timeout : -1); } + ieee802_1x_store_radius_class(hapd, sta, msg); break; case RADIUS_CODE_ACCESS_REJECT: sm->eapFail = TRUE; @@ -1180,7 +1181,6 @@ break; } - ieee802_1x_store_radius_class(hapd, sta, msg); ieee802_1x_decapsulate_radius(hapd, sta); if (override_eapReq) sm->be_auth.eapReq = FALSE; @@ -1669,6 +1669,7 @@ return len; } + void ieee802_1x_finished(struct hostapd_data *hapd, struct sta_info *sta, int success) { @@ -1682,4 +1683,3 @@ pmksa_cache_add(hapd, sta, key, dot11RSNAConfigPMKLifetime); } } - ==== //depot/projects/wifi/contrib/hostapd/ms_funcs.c#2 (text+ko) ==== @@ -158,12 +158,14 @@ }; const unsigned char *addr[3]; const size_t len[3] = { 16, 24, sizeof(magic1) }; + u8 hash[SHA1_MAC_LEN]; addr[0] = password_hash_hash; addr[1] = nt_response; addr[2] = magic1; - sha1_vector(3, addr, len, master_key); + sha1_vector(3, addr, len, hash); + memcpy(master_key, hash, 16); } ==== //depot/projects/wifi/contrib/hostapd/radius_client.c#2 (text+ko) ==== @@ -506,7 +506,7 @@ rconf = hapd->conf->auth_server; } - len = recv(sock, buf, sizeof(buf), 0); + len = recv(sock, buf, sizeof(buf), MSG_DONTWAIT); if (len < 0) { perror("recv[RADIUS]"); return; ==== //depot/projects/wifi/contrib/hostapd/radius_server.c#2 (text+ko) ==== @@ -325,6 +325,7 @@ { struct radius_msg *msg; int ret = 0; + struct eap_hdr eapfail; RADIUS_DEBUG("Reject invalid request from %s:%d", inet_ntoa(from->sin_addr), ntohs(from->sin_port)); @@ -335,6 +336,16 @@ return -1; } + memset(&eapfail, 0, sizeof(eapfail)); + eapfail.code = EAP_CODE_FAILURE; + eapfail.identifier = 0; + eapfail.length = htons(sizeof(eapfail)); + + if (!radius_msg_add_eap(msg, (u8 *) &eapfail, sizeof(eapfail))) { + RADIUS_DEBUG("Failed to add EAP-Message attribute"); + } + + if (radius_msg_finish_srv(msg, (u8 *) client->shared_secret, client->shared_secret_len, request->hdr->authenticator) < 0) { @@ -395,6 +406,7 @@ sess = radius_server_get_new_session(data, client, msg); if (sess == NULL) { RADIUS_DEBUG("Could not create a new session"); + radius_server_reject(data, client, msg, from); return -1; } } ==== //depot/projects/wifi/contrib/hostapd/tls_openssl.c#2 (text+ko) ==== @@ -489,9 +489,12 @@ if (private_key == NULL) return 0; - passwd = strdup(private_key_passwd); - if (passwd == NULL) - return -1; + if (private_key_passwd) { + passwd = strdup(private_key_passwd); + if (passwd == NULL) + return -1; + } else + passwd = NULL; SSL_CTX_set_default_passwd_cb(ssl_ctx, tls_passwd_cb); SSL_CTX_set_default_passwd_cb_userdata(ssl_ctx, passwd); ==== //depot/projects/wifi/contrib/hostapd/version.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ #ifndef VERSION_H #define VERSION_H -#define VERSION_STR "0.3.7" +#define VERSION_STR "0.3.9" #endif /* VERSION_H */ ==== //depot/projects/wifi/contrib/hostapd/wpa.c#2 (text+ko) ==== @@ -12,7 +12,7 @@ * * See README and COPYING for more details. * - * $FreeBSD: src/contrib/hostapd/wpa.c,v 1.2 2005/06/05 22:41:14 sam Exp $ + * $FreeBSD: src/contrib/hostapd/wpa.c,v 1.3 2005/06/13 17:07:31 sam Exp $ */ #include @@ -1416,6 +1416,14 @@ key = (struct wpa_eapol_key *) (hdr + 1); key_info = ntohs(key->key_info); key_data_length = ntohs(key->key_data_length); + if (key_data_length > data_len - sizeof(*hdr) - sizeof(*key)) { + wpa_printf(MSG_INFO, "WPA: Invalid EAPOL-Key frame - " + "key_data overflow (%d > %lu)", + key_data_length, + (unsigned long) (data_len - sizeof(*hdr) - + sizeof(*key))); + return; + } /* FIX: verify that the EAPOL-Key frame was encrypted if pairwise keys * are set */ ==== //depot/projects/wifi/contrib/libpcap/pcap-dos.c#2 (text+ko) ==== @@ -5,7 +5,7 @@ * pcap-dos.c: Interface to PKTDRVR, NDIS2 and 32-bit pmode * network drivers. * - * @(#) $Header: /tcpdump/master/libpcap/pcap-dos.c,v 1.1 2004/12/18 08:52:10 guy Exp $ (LBL) + * @(#) $Header: /tcpdump/master/libpcap/pcap-dos.c,v 1.1.2.1 2005/05/03 18:54:35 guy Exp $ (LBL) */ #include @@ -172,6 +172,7 @@ pcap->stats_op = pcap_stats_dos; pcap->inject_op = pcap_sendpacket_dos; pcap->setfilter_op = pcap_setfilter_dos; + pcap->setdirection_op = NULL; /* Not implemented.*/ pcap->fd = ++ref_count; if (pcap->fd == 1) /* first time we're called */ ==== //depot/projects/wifi/contrib/tcpdump/ipproto.c#2 (text+ko) ==== @@ -15,7 +15,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/ipproto.c,v 1.3 2004/12/15 08:41:26 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/ipproto.c,v 1.3.2.2 2005/05/20 21:15:45 hannes Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -24,8 +24,8 @@ #include +#include "interface.h" #include "ipproto.h" -#include "interface.h" struct tok ipproto_values[] = { { IPPROTO_HOPOPTS, "Options" }, @@ -51,6 +51,7 @@ { IPPROTO_PIM, "PIM" }, { IPPROTO_IPCOMP, "Compressed IP" }, { IPPROTO_VRRP, "VRRP" }, + { IPPROTO_PGM, "PGM" }, { IPPROTO_SCTP, "SCTP" }, { IPPROTO_MOBILITY, "Mobility" }, { 0, NULL } ==== //depot/projects/wifi/contrib/tcpdump/pmap_prot.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* @(#) $Header: /tcpdump/master/tcpdump/pmap_prot.h,v 1.1 2004/12/27 00:41:30 guy Exp $ (LBL) */ +/* @(#) $Header: /tcpdump/master/tcpdump/pmap_prot.h,v 1.1.2.2 2005/04/27 21:44:06 guy Exp $ (LBL) */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for * unrestricted use provided that this legend is included on all tape @@ -29,7 +29,7 @@ * * from: @(#)pmap_prot.h 1.14 88/02/08 SMI * from: @(#)pmap_prot.h 2.1 88/07/29 4.0 RPCSRC - * $FreeBSD: src/contrib/tcpdump/pmap_prot.h,v 1.1.1.1 2005/05/29 18:16:36 sam Exp $ + * $FreeBSD: src/contrib/tcpdump/pmap_prot.h,v 1.1.1.2 2005/07/11 03:53:37 sam Exp $ */ /* @@ -69,26 +69,21 @@ * The service supports remote procedure calls on udp/ip or tcp/ip socket 111. */ -#ifndef _RPC_PMAPPROT_H -#define _RPC_PMAPPROT_H +#define SUNRPC_PMAPPORT ((u_int16_t)111) +#define SUNRPC_PMAPPROG ((u_int32_t)100000) +#define SUNRPC_PMAPVERS ((u_int32_t)2) +#define SUNRPC_PMAPVERS_PROTO ((u_int32_t)2) +#define SUNRPC_PMAPVERS_ORIG ((u_int32_t)1) +#define SUNRPC_PMAPPROC_NULL ((u_int32_t)0) +#define SUNRPC_PMAPPROC_SET ((u_int32_t)1) +#define SUNRPC_PMAPPROC_UNSET ((u_int32_t)2) +#define SUNRPC_PMAPPROC_GETPORT ((u_int32_t)3) +#define SUNRPC_PMAPPROC_DUMP ((u_int32_t)4) +#define SUNRPC_PMAPPROC_CALLIT ((u_int32_t)5) -#define PMAPPORT ((u_int16_t)111) -#define PMAPPROG ((u_int32_t)100000) -#define PMAPVERS ((u_int32_t)2) -#define PMAPVERS_PROTO ((u_int32_t)2) -#define PMAPVERS_ORIG ((u_int32_t)1) -#define PMAPPROC_NULL ((u_int32_t)0) -#define PMAPPROC_SET ((u_int32_t)1) -#define PMAPPROC_UNSET ((u_int32_t)2) -#define PMAPPROC_GETPORT ((u_int32_t)3) -#define PMAPPROC_DUMP ((u_int32_t)4) -#define PMAPPROC_CALLIT ((u_int32_t)5) - -struct pmap { +struct sunrpc_pmap { u_int32_t pm_prog; u_int32_t pm_vers; u_int32_t pm_prot; u_int32_t pm_port; }; - -#endif /* !_RPC_PMAPPROT_H */ ==== //depot/projects/wifi/contrib/tcpdump/print-eigrp.c#2 (text+ko) ==== @@ -16,7 +16,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-eigrp.c,v 1.5 2004/05/12 22:22:40 hannes Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/print-eigrp.c,v 1.5.2.2 2005/05/06 02:53:41 guy Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -216,7 +216,7 @@ const struct eigrp_common_header *eigrp_com_header; const struct eigrp_tlv_header *eigrp_tlv_header; const u_char *tptr,*tlv_tptr; - int tlen,eigrp_tlv_len,eigrp_tlv_type,tlv_tlen,byte_length, bit_length; + u_int tlen,eigrp_tlv_len,eigrp_tlv_type,tlv_tlen, byte_length, bit_length; u_int8_t prefix[4]; union { @@ -271,15 +271,15 @@ while(tlen>0) { /* did we capture enough for fully decoding the object header ? */ - if (!TTEST2(*tptr, sizeof(struct eigrp_tlv_header))) - goto trunc; + TCHECK2(*tptr, sizeof(struct eigrp_tlv_header)); eigrp_tlv_header = (const struct eigrp_tlv_header *)tptr; eigrp_tlv_len=EXTRACT_16BITS(&eigrp_tlv_header->length); eigrp_tlv_type=EXTRACT_16BITS(&eigrp_tlv_header->type); - if (eigrp_tlv_len == 0 || eigrp_tlv_len > tlen) { + if (eigrp_tlv_len < sizeof(struct eigrp_tlv_header) || + eigrp_tlv_len > tlen) { print_unknown_data(tptr+sizeof(sizeof(struct eigrp_tlv_header)),"\n\t ",tlen); return; } @@ -295,8 +295,7 @@ tlv_tlen=eigrp_tlv_len-sizeof(struct eigrp_tlv_header); /* did we capture enough for fully decoding the object ? */ - if (!TTEST2(*tptr, eigrp_tlv_len)) - goto trunc; + TCHECK2(*tptr, eigrp_tlv_len); switch(eigrp_tlv_type) { @@ -326,7 +325,7 @@ tlv_ptr.eigrp_tlv_ip_int = (const struct eigrp_tlv_ip_int_t *)tlv_tptr; bit_length = tlv_ptr.eigrp_tlv_ip_int->plen; - if (bit_length < 0 || bit_length > 32) { + if (bit_length > 32) { printf("\n\t illegal prefix length %u",bit_length); break; } @@ -340,7 +339,7 @@ if (EXTRACT_32BITS(&tlv_ptr.eigrp_tlv_ip_int->nexthop) == 0) printf("self"); else - printf("%s",ipaddr_string(EXTRACT_32BITS(&tlv_ptr.eigrp_tlv_ip_int->nexthop))); + printf("%s",ipaddr_string(&tlv_ptr.eigrp_tlv_ip_int->nexthop)); printf("\n\t delay %u ms, bandwidth %u Kbps, mtu %u, hop %u, reliability %u, load %u", (EXTRACT_32BITS(&tlv_ptr.eigrp_tlv_ip_int->delay)/100), @@ -355,7 +354,7 @@ tlv_ptr.eigrp_tlv_ip_ext = (const struct eigrp_tlv_ip_ext_t *)tlv_tptr; bit_length = tlv_ptr.eigrp_tlv_ip_ext->plen; - if (bit_length < 0 || bit_length > 32) { + if (bit_length > 32) { printf("\n\t illegal prefix length %u",bit_length); break; } @@ -369,7 +368,7 @@ if (EXTRACT_32BITS(&tlv_ptr.eigrp_tlv_ip_ext->nexthop) == 0) printf("self"); else - printf("%s",ipaddr_string(EXTRACT_32BITS(&tlv_ptr.eigrp_tlv_ip_ext->nexthop))); + printf("%s",ipaddr_string(&tlv_ptr.eigrp_tlv_ip_ext->nexthop)); printf("\n\t origin-router %s, origin-as %u, origin-proto %s, flags [0x%02x], tag 0x%08x, metric %u", ipaddr_string(tlv_ptr.eigrp_tlv_ip_ext->origin_router), ==== //depot/projects/wifi/contrib/tcpdump/print-juniper.c#2 (text+ko) ==== @@ -15,7 +15,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-juniper.c,v 1.8 2005/04/06 21:32:41 mcr Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-juniper.c,v 1.8.2.13 2005/06/20 07:45:05 hannes Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -28,131 +28,476 @@ #include #include "interface.h" +#include "addrtoname.h" #include "extract.h" #include "ppp.h" #include "llc.h" #include "nlpid.h" +#include "ethertype.h" +#include "atm.h" #define JUNIPER_BPF_OUT 0 /* Outgoing packet */ #define JUNIPER_BPF_IN 1 /* Incoming packet */ #define JUNIPER_BPF_PKT_IN 0x1 /* Incoming packet */ #define JUNIPER_BPF_NO_L2 0x2 /* L2 header stripped */ +#define JUNIPER_MGC_NUMBER 0x4d4743 /* = "MGC" */ + +#define JUNIPER_LSQ_L3_PROTO_SHIFT 4 +#define JUNIPER_LSQ_L3_PROTO_MASK (0x17 << JUNIPER_LSQ_L3_PROTO_SHIFT) +#define JUNIPER_LSQ_L3_PROTO_IPV4 (0 << JUNIPER_LSQ_L3_PROTO_SHIFT) +#define JUNIPER_LSQ_L3_PROTO_IPV6 (1 << JUNIPER_LSQ_L3_PROTO_SHIFT) +#define JUNIPER_LSQ_L3_PROTO_MPLS (2 << JUNIPER_LSQ_L3_PROTO_SHIFT) +#define JUNIPER_LSQ_L3_PROTO_ISO (3 << JUNIPER_LSQ_L3_PROTO_SHIFT) + +#define JUNIPER_IPSEC_O_ESP_ENCRYPT_ESP_AUTHEN_TYPE 1 +#define JUNIPER_IPSEC_O_ESP_ENCRYPT_AH_AUTHEN_TYPE 2 +#define JUNIPER_IPSEC_O_ESP_AUTHENTICATION_TYPE 3 +#define JUNIPER_IPSEC_O_AH_AUTHENTICATION_TYPE 4 +#define JUNIPER_IPSEC_O_ESP_ENCRYPTION_TYPE 5 + +static struct tok juniper_ipsec_type_values[] = { + { JUNIPER_IPSEC_O_ESP_ENCRYPT_ESP_AUTHEN_TYPE, "ESP ENCR-AUTH" }, + { JUNIPER_IPSEC_O_ESP_ENCRYPT_AH_AUTHEN_TYPE, "ESP ENCR-AH AUTH" }, + { JUNIPER_IPSEC_O_ESP_AUTHENTICATION_TYPE, "ESP AUTH" }, + { JUNIPER_IPSEC_O_AH_AUTHENTICATION_TYPE, "AH AUTH" }, + { JUNIPER_IPSEC_O_ESP_ENCRYPTION_TYPE, "ESP ENCR" }, + { 0, NULL} +}; + +static struct tok juniper_direction_values[] = { + { JUNIPER_BPF_IN, "In"}, + { JUNIPER_BPF_OUT, "Out"}, + { 0, NULL} +}; + +struct juniper_cookie_table_t { + u_int32_t pictype; /* pic type */ + u_int8_t cookie_len; /* cookie len */ + const char *s; /* pic name */ +}; + +static struct juniper_cookie_table_t juniper_cookie_table[] = { +#ifdef DLT_JUNIPER_ATM1 + { DLT_JUNIPER_ATM1, 4, "ATM1"}, +#endif +#ifdef DLT_JUNIPER_ATM2 + { DLT_JUNIPER_ATM2, 8, "ATM2"}, +#endif +#ifdef DLT_JUNIPER_MLPPP + { DLT_JUNIPER_MLPPP, 2, "MLPPP"}, +#endif +#ifdef DLT_JUNIPER_MLFR + { DLT_JUNIPER_MLFR, 2, "MLFR"}, +#endif +#ifdef DLT_JUNIPER_MFR + { DLT_JUNIPER_MFR, 4, "MFR"}, +#endif +#ifdef DLT_JUNIPER_PPPOE + { DLT_JUNIPER_PPPOE, 0, "PPPoE"}, +#endif +#ifdef DLT_JUNIPER_PPPOE_ATM + { DLT_JUNIPER_PPPOE_ATM, 0, "PPPoE ATM"}, +#endif +#ifdef DLT_JUNIPER_GGSN + { DLT_JUNIPER_GGSN, 8, "GGSN"}, +#endif +#ifdef DLT_JUNIPER_MONITOR + { DLT_JUNIPER_MONITOR, 8, "MONITOR"}, +#endif +#ifdef DLT_JUNIPER_SERVICES + { DLT_JUNIPER_SERVICES, 8, "AS"}, +#endif +#ifdef DLT_JUNIPER_ES + { DLT_JUNIPER_ES, 0, "ES"}, +#endif + { 0, 0, NULL } +}; +struct juniper_l2info_t { + u_int32_t length; + u_int32_t caplen; + u_int32_t pictype; + u_int8_t direction; + u_int8_t header_len; + u_int8_t cookie_len; + u_int8_t cookie_type; + u_int8_t cookie[8]; + u_int8_t bundle; + u_int16_t proto; +}; + #define LS_COOKIE_ID 0x54 -#define LS_MLFR_LEN 4 -#define ML_MLFR_LEN 2 +#define AS_COOKIE_ID 0x47 +#define LS_MLFR_COOKIE_LEN 4 +#define ML_MLFR_COOKIE_LEN 2 +#define LS_MFR_COOKIE_LEN 6 +#define ATM1_COOKIE_LEN 4 +#define ATM2_COOKIE_LEN 8 #define ATM2_PKT_TYPE_MASK 0x70 #define ATM2_GAP_COUNT_MASK 0x3F +#define JUNIPER_PROTO_NULL 1 +#define JUNIPER_PROTO_IPV4 2 +#define JUNIPER_PROTO_IPV6 6 + +static struct tok juniper_protocol_values[] = { + { JUNIPER_PROTO_NULL, "Null" }, + { JUNIPER_PROTO_IPV4, "IPv4" }, + { JUNIPER_PROTO_IPV6, "IPv6" }, + { 0, NULL} +}; + int ip_heuristic_guess(register const u_char *, u_int); int juniper_ppp_heuristic_guess(register const u_char *, u_int); -static int juniper_parse_header (const u_char *, u_int8_t *, u_int); +static int juniper_parse_header (const u_char *, const struct pcap_pkthdr *, struct juniper_l2info_t *); + +#ifdef DLT_JUNIPER_GGSN +u_int +juniper_ggsn_print(const struct pcap_pkthdr *h, register const u_char *p) +{ + struct juniper_l2info_t l2info; + struct juniper_ggsn_header { + u_int8_t svc_id; + u_int8_t flags_len; + u_int8_t proto; + u_int8_t flags; + u_int8_t vlan_id[2]; + u_int8_t res[2]; + }; + const struct juniper_ggsn_header *gh; + + l2info.pictype = DLT_JUNIPER_GGSN; + if(juniper_parse_header(p, h, &l2info) == 0) + return l2info.header_len; + + p+=l2info.header_len; + gh = (struct juniper_ggsn_header *)p; + + if (eflag) + printf("proto %s (%u), vlan %u: ", + tok2str(juniper_protocol_values,"Unknown",gh->proto), + gh->proto, + EXTRACT_16BITS(&gh->vlan_id[0])); + + switch (gh->proto) { + case JUNIPER_PROTO_IPV4: + ip_print(gndo, p, l2info.length); + break; +#ifdef INET6 + case JUNIPER_PROTO_IPV6: + ip6_print(p, l2info.length); + break; +#endif /* INET6 */ + default: + if (!eflag) + printf("unknown GGSN proto (%u)", gh->proto); + } + + return l2info.header_len; +} +#endif +#ifdef DLT_JUNIPER_ES u_int -juniper_mlppp_print(const struct pcap_pkthdr *h, register const u_char *p) +juniper_es_print(const struct pcap_pkthdr *h, register const u_char *p) { - register u_int length = h->len; - register u_int caplen = h->caplen; - u_int8_t direction,bundle,cookie_len; - u_int32_t cookie,proto; - - if(juniper_parse_header(p, &direction,length) == 0) - return 0; + struct juniper_l2info_t l2info; + struct juniper_ipsec_header { + u_int8_t sa_index[2]; + u_int8_t ttl; + u_int8_t type; + u_int8_t spi[4]; + u_int8_t src_ip[4]; + u_int8_t dst_ip[4]; + }; + u_int rewrite_len,es_type_bundle; + const struct juniper_ipsec_header *ih; + + l2info.pictype = DLT_JUNIPER_ES; + if(juniper_parse_header(p, h, &l2info) == 0) + return l2info.header_len; + + p+=l2info.header_len; + ih = (struct juniper_ipsec_header *)p; + + switch (ih->type) { + case JUNIPER_IPSEC_O_ESP_ENCRYPT_ESP_AUTHEN_TYPE: + case JUNIPER_IPSEC_O_ESP_ENCRYPT_AH_AUTHEN_TYPE: + rewrite_len = 0; + es_type_bundle = 1; + break; + case JUNIPER_IPSEC_O_ESP_AUTHENTICATION_TYPE: + case JUNIPER_IPSEC_O_AH_AUTHENTICATION_TYPE: + case JUNIPER_IPSEC_O_ESP_ENCRYPTION_TYPE: + rewrite_len = 16; + es_type_bundle = 0; + default: + printf("ES Invalid type %u, length %u", + ih->type, + l2info.length); + return l2info.header_len; + } - p+=4; - length-=4; - caplen-=4; + l2info.length-=rewrite_len; + p+=rewrite_len; - if (p[0] == LS_COOKIE_ID) { - cookie=EXTRACT_32BITS(p); - if (eflag) printf("LSPIC-MLPPP cookie 0x%08x, ",cookie); - cookie_len = LS_MLFR_LEN; - bundle = cookie & 0xff; - } else { - cookie=EXTRACT_16BITS(p); - if (eflag) printf("MLPIC-MLPPP cookie 0x%04x, ",cookie); - cookie_len = ML_MLFR_LEN; - bundle = (cookie >> 8) & 0xff; + if (eflag) { + if (!es_type_bundle) { + printf("ES SA, index %u, ttl %u type %s (%u), spi %u, Tunnel %s > %s, length %u\n", + EXTRACT_16BITS(&ih->sa_index), + ih->ttl, + tok2str(juniper_ipsec_type_values,"Unknown",ih->type), + ih->type, + EXTRACT_32BITS(&ih->spi), + ipaddr_string(EXTRACT_32BITS(&ih->src_ip)), + ipaddr_string(EXTRACT_32BITS(&ih->dst_ip)), + l2info.length); + } else { + printf("ES SA, index %u, ttl %u type %s (%u), length %u\n", + EXTRACT_16BITS(&ih->sa_index), + ih->ttl, + tok2str(juniper_ipsec_type_values,"Unknown",ih->type), + ih->type, + l2info.length); + } } - proto = EXTRACT_16BITS(p+cookie_len); - p += cookie_len; - length-= cookie_len; - caplen-= cookie_len; + ip_print(gndo, p, l2info.length); + return l2info.header_len; +} +#endif + +#ifdef DLT_JUNIPER_MONITOR +u_int +juniper_monitor_print(const struct pcap_pkthdr *h, register const u_char *p) +{ + struct juniper_l2info_t l2info; + struct juniper_monitor_header { + u_int8_t pkt_type; + u_int8_t padding; + u_int8_t iif[2]; + u_int8_t service_id[4]; + }; + const struct juniper_monitor_header *mh; + + l2info.pictype = DLT_JUNIPER_MONITOR; + if(juniper_parse_header(p, h, &l2info) == 0) + return l2info.header_len; + + p+=l2info.header_len; + mh = (struct juniper_monitor_header *)p; + + if (eflag) + printf("service-id %u, iif %u, pkt-type %u: ", + EXTRACT_32BITS(&mh->service_id), + EXTRACT_16BITS(&mh->iif), + mh->pkt_type); + + /* no proto field - lets guess by first byte of IP header*/ + ip_heuristic_guess(p, l2info.length); + + return l2info.header_len; +} +#endif + +#ifdef DLT_JUNIPER_SERVICES +u_int +juniper_services_print(const struct pcap_pkthdr *h, register const u_char *p) +{ + struct juniper_l2info_t l2info; + struct juniper_services_header { + u_int8_t svc_id; + u_int8_t flags_len; + u_int8_t svc_set_id[2]; + u_int8_t dir_iif[4]; + }; + const struct juniper_services_header *sh; + + l2info.pictype = DLT_JUNIPER_SERVICES; + if(juniper_parse_header(p, h, &l2info) == 0) + return l2info.header_len; + + p+=l2info.header_len; + sh = (struct juniper_services_header *)p; + + if (eflag) + printf("service-id %u flags 0x%02x service-set-id 0x%04x iif %u: ", + sh->svc_id, + sh->flags_len, + EXTRACT_16BITS(&sh->svc_set_id), + EXTRACT_24BITS(&sh->dir_iif[1])); + + /* no proto field - lets guess by first byte of IP header*/ + ip_heuristic_guess(p, l2info.length); + + return l2info.header_len; +} +#endif + +#ifdef DLT_JUNIPER_PPPOE +u_int +juniper_pppoe_print(const struct pcap_pkthdr *h, register const u_char *p) +{ + struct juniper_l2info_t l2info; + + l2info.pictype = DLT_JUNIPER_PPPOE; + if(juniper_parse_header(p, h, &l2info) == 0) + return l2info.header_len; + + p+=l2info.header_len; + /* this DLT contains nothing but raw ethernet frames */ + ether_print(p, l2info.length, l2info.caplen); + return l2info.header_len; +} +#endif + +#ifdef DLT_JUNIPER_PPPOE_ATM +u_int +juniper_pppoe_atm_print(const struct pcap_pkthdr *h, register const u_char *p) +{ + struct juniper_l2info_t l2info; + u_int16_t extracted_ethertype; + + l2info.pictype = DLT_JUNIPER_PPPOE_ATM; + if(juniper_parse_header(p, h, &l2info) == 0) + return l2info.header_len; + + p+=l2info.header_len; + + extracted_ethertype = EXTRACT_16BITS(p); + /* this DLT contains nothing but raw PPPoE frames, + * prepended with a type field*/ + if (ether_encap_print(extracted_ethertype, + p+ETHERTYPE_LEN, + l2info.length-ETHERTYPE_LEN, + l2info.caplen-ETHERTYPE_LEN, + &extracted_ethertype) == 0) + /* ether_type not known, probably it wasn't one */ + printf("unknown ethertype 0x%04x", extracted_ethertype); + + return l2info.header_len; +} +#endif + +#ifdef DLT_JUNIPER_MLPPP +u_int +juniper_mlppp_print(const struct pcap_pkthdr *h, register const u_char *p) +{ + struct juniper_l2info_t l2info; + + l2info.pictype = DLT_JUNIPER_MLPPP; + if(juniper_parse_header(p, h, &l2info) == 0) + return l2info.header_len; /* suppress Bundle-ID if frame was captured on a child-link - * this may be the case if the cookie looks like a proto */ + * best indicator if the cookie looks like a proto */ if (eflag && - cookie != PPP_OSI && - cookie != (PPP_ADDRESS << 8 | PPP_CONTROL)) - printf("Bundle-ID %u, ",bundle); + EXTRACT_16BITS(&l2info.cookie) != PPP_OSI && + EXTRACT_16BITS(&l2info.cookie) != (PPP_ADDRESS << 8 | PPP_CONTROL)) + printf("Bundle-ID %u: ",l2info.bundle); + + p+=l2info.header_len; + + /* first try the LSQ protos */ + switch(l2info.proto) { + case JUNIPER_LSQ_L3_PROTO_IPV4: + ip_print(gndo, p, l2info.length); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 15 01:30:25 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 340E716A420; Fri, 15 Jul 2005 01:30:25 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E427816A41C for ; Fri, 15 Jul 2005 01:30:24 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F1C143D46 for ; Fri, 15 Jul 2005 01:30:24 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6F1UO14048907 for ; Fri, 15 Jul 2005 01:30:24 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6F1UOFR048894 for perforce@freebsd.org; Fri, 15 Jul 2005 01:30:24 GMT (envelope-from sam@freebsd.org) Date: Fri, 15 Jul 2005 01:30:24 GMT Message-Id: <200507150130.j6F1UOFR048894@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 80223 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2005 01:30:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=80223 Change 80223 by sam@sam_ebb on 2005/07/15 01:29:47 IFC Affected files ... .. //depot/projects/wifi/sbin/dhclient/alloc.c#2 integrate .. //depot/projects/wifi/sbin/dhclient/bpf.c#3 integrate .. //depot/projects/wifi/sbin/dhclient/clparse.c#2 integrate .. //depot/projects/wifi/sbin/dhclient/conflex.c#2 integrate .. //depot/projects/wifi/sbin/dhclient/convert.c#2 integrate .. //depot/projects/wifi/sbin/dhclient/dhclient-script#6 integrate .. //depot/projects/wifi/sbin/dhclient/dhclient-script.8#2 integrate .. //depot/projects/wifi/sbin/dhclient/dhclient.8#2 integrate .. //depot/projects/wifi/sbin/dhclient/dhclient.c#7 integrate .. //depot/projects/wifi/sbin/dhclient/dhclient.conf#2 integrate .. //depot/projects/wifi/sbin/dhclient/dhclient.conf.5#2 integrate .. //depot/projects/wifi/sbin/dhclient/dhclient.leases.5#2 integrate .. //depot/projects/wifi/sbin/dhclient/dhcp-options.5#2 integrate .. //depot/projects/wifi/sbin/dhclient/dhcp.h#2 integrate .. //depot/projects/wifi/sbin/dhclient/dhcpd.h#2 integrate .. //depot/projects/wifi/sbin/dhclient/dhctoken.h#2 integrate .. //depot/projects/wifi/sbin/dhclient/dispatch.c#2 integrate .. //depot/projects/wifi/sbin/dhclient/errwarn.c#2 integrate .. //depot/projects/wifi/sbin/dhclient/hash.c#2 integrate .. //depot/projects/wifi/sbin/dhclient/inet.c#2 integrate .. //depot/projects/wifi/sbin/dhclient/options.c#2 integrate .. //depot/projects/wifi/sbin/dhclient/packet.c#2 integrate .. //depot/projects/wifi/sbin/dhclient/parse.c#3 integrate .. //depot/projects/wifi/sbin/dhclient/privsep.c#2 integrate .. //depot/projects/wifi/sbin/dhclient/privsep.h#2 integrate .. //depot/projects/wifi/sbin/dhclient/tables.c#2 integrate .. //depot/projects/wifi/sbin/dhclient/tree.c#2 integrate .. //depot/projects/wifi/sbin/dhclient/tree.h#2 integrate Differences ... ==== //depot/projects/wifi/sbin/dhclient/alloc.c#2 (text+ko) ==== ==== //depot/projects/wifi/sbin/dhclient/bpf.c#3 (text+ko) ==== ==== //depot/projects/wifi/sbin/dhclient/clparse.c#2 (text+ko) ==== ==== //depot/projects/wifi/sbin/dhclient/conflex.c#2 (text+ko) ==== ==== //depot/projects/wifi/sbin/dhclient/convert.c#2 (text+ko) ==== ==== //depot/projects/wifi/sbin/dhclient/dhclient-script#6 (text+ko) ==== @@ -1,6 +1,7 @@ #!/bin/sh # # $OpenBSD: dhclient-script,v 1.6 2004/05/06 18:22:41 claudio Exp $ +# $FreeBSD: src/sbin/dhclient/dhclient-script,v 1.4 2005/06/10 03:41:18 brooks Exp $ # # Copyright (c) 2003 Kenneth R Westerback # @@ -171,10 +172,31 @@ return 1 } +# Must be used on exit. Invokes the local dhcp client exit hooks, if any. +exit_with_hooks() { + exit_status=$1 + if [ -f /etc/dhclient-exit-hooks ]; then + . /etc/dhclient-exit-hooks + fi + # probably should do something with exit status of the local script + exit $exit_status +} + # # Start of active code. # +# Invoke the local dhcp client enter hooks, if they exist. +if [ -f /etc/dhclient-enter-hooks ]; then + exit_status=0 + . /etc/dhclient-enter-hooks + # allow the local script to abort processing of this state + # local script must set exit_status variable to nonzero. + if [ $exit_status -ne 0 ]; then + exit $exit_status + fi +fi + if [ -x $NETSTAT ]; then if_defaulroute=`$NETSTAT -rn | $GREP "^default" | $AWK '{print $6}'` else @@ -246,14 +268,14 @@ fi add_new_routes if add_new_resolv_conf; then - exit 0 + exit_with_hooks 0 fi fi fi ifconfig $interface inet -alias $new_ip_address $medium delete_old_routes - exit 1 + exit_with_hooks 1 ;; esac -exit 0 +exit_with_hooks 0 ==== //depot/projects/wifi/sbin/dhclient/dhclient-script.8#2 (text+ko) ==== @@ -36,6 +36,8 @@ .\" see ``http://www.isc.org/isc''. To learn more about Vixie .\" Enterprises, see ``http://www.vix.com''. .\" +.\" $FreeBSD: src/sbin/dhclient/dhclient-script.8,v 1.2 2005/06/22 14:55:59 ru Exp $ +.\" .Dd January 1, 1997 .Dt DHCLIENT-SCRIPT 8 .Os @@ -65,21 +67,23 @@ .Xr dhclient 8 needs to invoke the client configuration script, it sets up a number of environment variables and runs -.Nm dhclient-script . +.Nm . In all cases, .Va $reason is set to the name of the reason why the script has been invoked. The following reasons are currently defined: -MEDIUM, PREINIT, ARPCHECK, ARPSEND, BOUND, RENEW, REBIND, REBOOT, -EXPIRE, FAIL and TIMEOUT. -.Bl -tag -width "ARPCHECK" -.It MEDIUM +.Li MEDIUM , PREINIT , ARPCHECK , ARPSEND , BOUND , RENEW , REBIND , REBOOT , +.Li EXPIRE , FAIL +and +.Li TIMEOUT . +.Bl -tag -width ".Li ARPCHECK" +.It Li MEDIUM The DHCP client is requesting that an interface's media type be set. The interface name is passed in .Va $interface , and the media type is passed in .Va $medium . -.It PREINIT +.It Li PREINIT The DHCP client is requesting that an interface be configured as required in order to send packets prior to receiving an actual address. .\" For clients which use the BSD socket library, @@ -98,25 +102,29 @@ .Va $alias_ip_address , and that IP alias should be deleted from the interface, along with any routes to it. -.It ARPSEND +.It Li ARPSEND The DHCP client is requesting that an address that has been offered to it be checked to see if somebody else is using it, by sending an ARP request for that address. -It's not clear how to implement this, so no examples exist yet. +It is not clear how to implement this, so no examples exist yet. The IP address to check is passed in .Va $new_ip_address , and the interface name is passed in .Va $interface . -.It ARPCHECK +.It Li ARPCHECK The DHCP client wants to know if a response to the ARP request sent -using ARPSEND has been received. +using +.Li ARPSEND +has been received. If one has, the script should exit with a nonzero status, indicating that the offered address has already been requested and should be declined. +The .Va $new_ip_address and .Va $interface -are set as with ARPSEND. -.It BOUND +variables are set as with +.Li ARPSEND . +.It Li BOUND The DHCP client has done an initial binding to a new address. The new IP address is passed in .Va $new_ip_address , @@ -128,10 +136,11 @@ described in .Xr dhcp-options 5 , except that dashes -.Pq Sq - +.Pq Ql - are replaced by underscores -.Pq Sq _ -in order to make valid shell variables, and the variable names start with new_. +.Pq Ql _ +in order to make valid shell variables, and the variable names start with +.Dq Li new_ . So for example, the new subnet mask would be passed in .Va $new_subnet_mask . .Pp @@ -154,48 +163,63 @@ .Va $alias_ip_address , and other DHCP options that are set for the alias (e.g., subnet mask) will be passed in variables named as described previously except starting with -$alias_ instead of $new_. +.Dq Li $alias_ +instead of +.Dq Li $new_ . Care should be taken that the alias IP address not be used if it is identical to the bound IP address .Pq Va $new_ip_address , since the other alias parameters may be incorrect in this case. -.It RENEW -When a binding has been renewed, the script is called as in BOUND, -except that in addition to all the variables starting with $new_, -there is another set of variables starting with $old_. -Persistent settings that may have changed need to be deleted \- for example, +.It Li RENEW +When a binding has been renewed, the script is called as in +.Li BOUND , +except that in addition to all the variables starting with +.Dq Li $new_ , +there is another set of variables starting with +.Dq Li $old_ . +Persistent settings that may have changed need to be deleted - for example, if a local route to the bound address is being configured, the old local route should be deleted. If the default route has changed, the old default route should be deleted. If the static routes have changed, the old ones should be deleted. -Otherwise, processing can be done as with BOUND. -.It REBIND +Otherwise, processing can be done as with +.Li BOUND . +.It Li REBIND The DHCP client has rebound to a new DHCP server. -This can be handled as with RENEW, except that if the IP address has changed, +This can be handled as with +.Li RENEW , +except that if the IP address has changed, the ARP table should be cleared. -.It REBOOT +.It Li REBOOT The DHCP client has successfully reacquired its old address after a reboot. -This can be processed as with BOUND. -.It EXPIRE +This can be processed as with +.Li BOUND . +.It Li EXPIRE The DHCP client has failed to renew its lease or acquire a new one, and the lease has expired. The IP address must be relinquished, and all related parameters should be -deleted, as in RENEW and REBIND. -.It FAIL +deleted, as in +.Li RENEW +and +.Li REBIND . +.It Li FAIL The DHCP client has been unable to contact any DHCP servers, and any leases that have been tested have not proved to be valid. The parameters from the last lease tested should be deconfigured. -This can be handled in the same way as EXPIRE. -.It TIMEOUT +This can be handled in the same way as +.Li EXPIRE . +.It Li TIMEOUT The DHCP client has been unable to contact any DHCP servers. However, an old lease has been identified, and its parameters have -been passed in as with BOUND. +been passed in as with +.Li BOUND . The client configuration script should test these parameters and, if it has reason to believe they are valid, should exit with a value of zero. If not, it should exit with a nonzero value. .El .Pp -The usual way to test a lease is to set up the network as with REBIND +The usual way to test a lease is to set up the network as with +.Li REBIND (since this may be called to test more than one lease) and then ping the first router defined in .Va $routers . @@ -221,6 +245,7 @@ .Xr dhcpd 8 , .Xr dhcrelay 8 .Sh AUTHORS +.An -nosplit The original version of .Nm was written for the Internet Software Consortium by @@ -234,13 +259,15 @@ was written by .An Kenneth R. Westerback Aq krw@openbsd.org . .Sh BUGS -If more than one interface is being used, there's no obvious way to -avoid clashes between server-supplied configuration parameters \- for -example, the stock dhclient-script rewrites +If more than one interface is being used, there is no obvious way to +avoid clashes between server-supplied configuration parameters - for +example, the stock +.Nm +rewrites .Pa /etc/resolv.conf . If more than one interface is being configured, .Pa /etc/resolv.conf will be repeatedly initialized to the values provided by one server, and then the other. -Assuming the information provided by both servers is valid, this shouldn't +Assuming the information provided by both servers is valid, this should not cause any real problems, but it could be confusing. ==== //depot/projects/wifi/sbin/dhclient/dhclient.8#2 (text+ko) ==== @@ -35,12 +35,15 @@ .\" Enterprises. To learn more about the Internet Software Consortium, .\" see ``http://www.isc.org/isc''. To learn more about Vixie .\" Enterprises, see ``http://www.vix.com''. +.\" +.\" $FreeBSD: src/sbin/dhclient/dhclient.8,v 1.2 2005/06/22 14:55:59 ru Exp $ +.\" .Dd April 7, 2004 .Dt DHCLIENT 8 .Os .Sh NAME .Nm dhclient -.Nd Dynamic Host Configuration Protocol (DHCP) Client +.Nd "Dynamic Host Configuration Protocol (DHCP) client" .Sh SYNOPSIS .Nm .Op Fl dqu @@ -59,7 +62,7 @@ configure must be specified on the command line. .Pp The options are as follows: -.Bl -tag -width "-p port" +.Bl -tag -width ".Fl c Ar file" .It Fl c Ar file Specify an alternate location, .Ar file , @@ -110,11 +113,12 @@ restarts, .Nm keeps a list of leases it has been assigned in the -.Pa /var/db/dhclient.leases.IFNAME +.Pa /var/db/dhclient.leases. Ns Ar IFNAME file. -.Qq IFNAME +.Ar IFNAME represents the network interface of the DHCP client -.Pq e.g. em0 , +(e.g., +.Li em0 ) , one for each interface. On startup, after reading the .Xr dhclient.conf 5 @@ -128,7 +132,7 @@ is first invoked (generally during the initial system boot process). In that event, old leases from the -.Pa dhclient.leases.IFNAME +.Pa dhclient.leases. Ns Ar IFNAME file which have not yet expired are tested, and if they are determined to be valid, they are used until either they expire or the DHCP server becomes available. @@ -149,18 +153,20 @@ than cycling through the list of old leases. .Sh NOTES You must have the Berkeley Packet Filter (BPF) configured in your kernel. +The .Nm +utility requires at least one .Pa /dev/bpf* -file for each broadcast network interface that is attached to your system. +device for each broadcast network interface that is attached to your system. See .Xr bpf 4 for more information. .Sh FILES -.Bl -tag -width /var/db/dhclient.leases.IFNAME~ -compact +.Bl -tag -width ".Pa /var/db/dhclient.leases. Ns Ar IFNAME" -compact .It Pa /etc/dhclient.conf DHCP client configuration file -.It Pa /var/db/dhclient.leases.IFNAME +.It Pa /var/db/dhclient.leases. Ns Ar IFNAME database of acquired leases .El .Sh SEE ALSO @@ -171,7 +177,10 @@ .Xr dhcpd 8 , .Xr dhcrelay 8 .Sh AUTHORS +.An -nosplit +The .Nm +utility was written by .An Ted Lemon Aq mellon@fugue.com and ==== //depot/projects/wifi/sbin/dhclient/dhclient.c#7 (text+ko) ==== @@ -1,4 +1,5 @@ -/* $OpenBSD: dhclient.c,v 1.61 2004/11/25 11:05:10 claudio Exp $ */ +/* $OpenBSD: dhclient.c,v 1.63 2005/02/06 17:10:13 krw Exp $ */ +/* $FreeBSD: src/sbin/dhclient/dhclient.c,v 1.6 2005/06/30 05:50:52 brooks Exp $ */ /* * Copyright 2004 Henning Brauer @@ -226,7 +227,7 @@ break; if (findproto((char *)(ifam + 1), ifam->ifam_addrs) != AF_INET) break; - if (scripttime == 0 || t < scripttime + 3) + if (scripttime == 0 || t < scripttime + 10) break; goto die; case RTM_IFINFO: @@ -256,12 +257,15 @@ * state and then wait for either a link down * notification or an associate event. */ - script_init("EXPIRE", NULL); - script_write_params("old_", ifi->client->active); - if (ifi->client->alias) - script_write_params("alias_", - ifi->client->alias); - script_go(); + if (ifi->client->active != NULL) { + script_init("EXPIRE", NULL); + script_write_params("old_", + ifi->client->active); + if (ifi->client->alias) + script_write_params("alias_", + ifi->client->alias); + script_go(); + } ifi->client->state = S_INIT; break; } @@ -346,7 +350,7 @@ read_client_conf(); if (!interface_link_status(ifi->name)) { - fprintf(stderr, "%s: no link ", ifi->name); + fprintf(stderr, "%s: no link ...", ifi->name); fflush(stderr); sleep(1); while (!interface_link_status(ifi->name)) { @@ -358,7 +362,7 @@ } sleep(1); } - fprintf(stderr, "got link\n"); + fprintf(stderr, " got link\n"); } if ((nullfd = open(_PATH_DEVNULL, O_RDWR, 0)) == -1) @@ -723,7 +727,7 @@ note("bound to %s -- renewal in %d seconds.", piaddr(ip->client->active->address), - ip->client->active->renewal - cur_time); + (int)(ip->client->active->renewal - cur_time)); ip->client->state = S_BOUND; reinitialize_interfaces(); go_daemon(); @@ -1144,7 +1148,8 @@ note("DHCPDISCOVER on %s to %s port %d interval %d", ip->name, inet_ntoa(sockaddr_broadcast.sin_addr), - ntohs(sockaddr_broadcast.sin_port), ip->client->interval); + ntohs(sockaddr_broadcast.sin_port), + (int)ip->client->interval); /* Send out a packet. */ (void)send_packet(ip, &ip->client->packet, ip->client->packet_length, @@ -1195,8 +1200,8 @@ ip->client->active->renewal) { ip->client->state = S_BOUND; note("bound: renewal in %d seconds.", - ip->client->active->renewal - - cur_time); + (int)(ip->client->active->renewal - + cur_time)); add_timeout( ip->client->active->renewal, state_bound, ip); @@ -2223,13 +2228,18 @@ case DHO_NETBIOS_DD_SERVER: case DHO_FONT_SERVERS: case DHO_DHCP_SERVER_IDENTIFIER: + case DHO_SMTP_SERVER: + case DHO_POP_SERVER: + case DHO_NNTP_SERVER: + case DHO_WWW_SERVER: + case DHO_FINGER_SERVER: + case DHO_IRC_SERVER: if (!ipv4addrs(opbuf)) { warning("Invalid IP address in option: %s", opbuf); return (0); } return (1) ; case DHO_HOST_NAME: - case DHO_DOMAIN_NAME: case DHO_NIS_DOMAIN: if (!res_hnok(sbuf)) { warning("Bogus Host Name option %d: %s (%s)", option, @@ -2237,6 +2247,7 @@ return (0); } return (1); + case DHO_DOMAIN_NAME: case DHO_PAD: case DHO_TIME_OFFSET: case DHO_BOOT_SIZE: ==== //depot/projects/wifi/sbin/dhclient/dhclient.conf#2 (text+ko) ==== ==== //depot/projects/wifi/sbin/dhclient/dhclient.conf.5#2 (text+ko) ==== @@ -36,6 +36,8 @@ .\" see ``http://www.isc.org/isc''. To learn more about Vixie .\" Enterprises, see ``http://www.vix.com''. .\" +.\" $FreeBSD: src/sbin/dhclient/dhclient.conf.5,v 1.2 2005/06/22 14:55:59 ru Exp $ +.\" .Dd January 1, 1997 .Dt DHCLIENT.CONF 5 .Os @@ -58,7 +60,7 @@ Keywords in the file are case-insensitive. Comments may be placed anywhere within the file (except within quotes). Comments begin with the -.Sq # +.Ql # character and end at the end of the line. .Pp The @@ -70,23 +72,23 @@ the server, or values to prepend or append to information provided by the server. The configuration file can also be preinitialized with addresses to -use on networks that don't have DHCP servers. +use on networks that do not have DHCP servers. .Sh PROTOCOL TIMING The timing behaviour of the client need not be configured by the user. If no timing configuration is provided by the user, a fairly -reasonable timing behaviour will be used by default \- one which +reasonable timing behaviour will be used by default - one which results in fairly timely updates without placing an inordinate load on the server. .Pp The following statements can be used to adjust the timing behaviour of the DHCP client if required, however: -.Bl -tag -width Ds +.Bl -tag -width indent .It Ic timeout Ar time ; The .Ic timeout statement determines the amount of time that must pass between the time that the client begins to try to determine its address and the -time that it decides that it's not going to be able to contact a server. +time that it decides that it is not going to be able to contact a server. By default, this timeout is sixty seconds. After the timeout has passed, if there are any static leases defined in the configuration file, or any leases remaining in the lease database that @@ -122,7 +124,7 @@ .Pp By default, the .Ic select-timeout -is zero seconds \- that is, the client will take the first offer it sees. +is zero seconds - that is, the client will take the first offer it sees. .It Ic reboot Ar time ; When the client is restarted, it first tries to reacquire the last address it had. @@ -151,7 +153,9 @@ server and the second attempt to reach a server. Each time a message is sent, the interval between messages is incremented by twice the current interval multiplied by a random number between zero and one. -If it is greater than the backoff-cutoff amount, it is set to that +If it is greater than the +.Ic backoff-cutoff +amount, it is set to that amount. It defaults to ten seconds. .El @@ -160,7 +164,7 @@ specific information, and not send it other information that it is not prepared to accept. The protocol also allows the client to reject offers from servers if they -don't contain information the client needs, or if the information provided +do not contain information the client needs, or if the information provided is not satisfactory. .Pp There is a variety of data contained in offers that DHCP servers send @@ -169,29 +173,20 @@ .Em DHCP Options . DHCP Options are defined in .Xr dhcp-options 5 . -.Bl -tag -width Ds -.It Xo -.Ic request Op Ar option -.Oo , Ar ... option Oc ; -.Xc +.Bl -tag -width indent +.It Ic request Oo Ar option Oc Oo , Ar ... option Oc ; The .Ic request statement causes the client to request that any server responding to the client send the client its values for the specified options. -Only the option names should be specified in the request statement \- not +Only the option names should be specified in the request statement - not option parameters. -.It Xo -.Ic require Op Ar option -.Oo , Ar ... option Oc ; -.Xc +.It Ic require Oo Ar option Oc Oo , Ar ... option Oc ; The .Ic require statement lists options that must be sent in order for an offer to be accepted. Offers that do not contain all the listed options will be ignored. -.It Xo -.Ic send No { Op Ar option declaration -.Oo , Ar ... option declaration Oc } -.Xc +.It Ic send No { Oo Ar option declaration Oc Oo , Ar ... option declaration Oc } The .Ic send statement causes the client to send the specified options to the server with @@ -213,7 +208,7 @@ It may also receive information which is useful, but which needs to be supplemented with local information. To handle these needs, several option modifiers are available. -.Bl -tag -width Ds +.Bl -tag -width indent .It Xo .Ic default No { Op Ar option declaration .Oo , Ar ... option declaration Oc } @@ -245,7 +240,7 @@ .Ic prepend statement can only be used for options which allow more than one value to be given. -This restriction is not enforced \- if violated, the results are unpredictable. +This restriction is not enforced - if violated, the results are unpredictable. .It Xo .Ic append No { Op Ar option declaration .Oo , Ar ... option declaration Oc } @@ -259,16 +254,13 @@ .Ic append statement can only be used for options which allow more than one value to be given. -This restriction is not enforced \- if you ignore it, +This restriction is not enforced - if you ignore it, the behaviour will be unpredictable. .El .Sh LEASE DECLARATIONS The lease declaration: .Pp -.Xo -.Ic \ \& lease No { Ar lease-declaration -.Oo Ar ... lease-declaration Oc } -.Xc +.D1 Ic lease No { Ar lease-declaration Oo Ar ... lease-declaration Oc } .Pp The DHCP client may decide after some period of time (see .Sx PROTOCOL TIMING ) @@ -293,11 +285,13 @@ file. Such syntax is documented here for completeness. .Pp -A lease statement consists of the lease keyword, followed by a left +A lease statement consists of the +.Ic lease +keyword, followed by a left curly brace, followed by one or more lease declaration statements, followed by a right curly brace. The following lease declarations are possible: -.Bl -tag -width Ds +.Bl -tag -width indent .It Ic bootp ; The .Ic bootp @@ -305,7 +299,7 @@ BOOTP protocol rather than the DHCP protocol. It is never necessary to specify this in the client configuration file. The client uses this syntax in its lease database file. -.It Ic interface Ar \&"string\&" ; +.It Ic interface Qq Ar string ; The .Ic interface lease statement is used to indicate the interface on which the lease is valid. @@ -320,14 +314,15 @@ .Ic fixed-address statement is used to set the IP address of a particular lease. This is required for all lease statements. -The IP address must be specified as a dotted quad (e.g., 12.34.56.78). -.It Ic filename Ar \&"string\&" ; +The IP address must be specified as a dotted quad (e.g., +.Li 12.34.56.78 ) . +.It Ic filename Qq Ar string ; The .Ic filename statement specifies the name of the boot filename to use. This is not used by the standard client configuration script, but is included for completeness. -.It Ic server-name Ar \&"string\&" ; +.It Ic server-name Qq Ar string ; The .Ic server-name statement specifies the name of the boot server name to use. @@ -337,10 +332,10 @@ .Ic option statement is used to specify the value of an option supplied by the server, or, in the case of predefined leases declared in -.Nm dhclient.conf , +.Nm , the value that the user wishes the client configuration script to use if the predefined lease is used. -.It Ic script Ar \&"script-name\&" ; +.It Ic script Qq Ar script-name ; The .Ic script statement is used to specify the pathname of the DHCP client configuration @@ -353,16 +348,22 @@ any, and also called once if no valid lease can be identified. For more information, see .Xr dhclient.leases 5 . -.It Ic medium Ar \&"media setup\&" ; +.It Ic medium Qq Ar "media setup" ; The .Ic medium statement can be used on systems where network interfaces cannot automatically determine the type of network to which they are connected. -The media setup string is a system-dependent parameter which is passed +The +.Ar "media setup" +string is a system-dependent parameter which is passed to the DHCP client configuration script when initializing the interface. On .Ux -and UNIX-like systems, the argument is passed on the ifconfig command line +and +.Ux Ns -like +systems, the argument is passed on the +.Xr ifconfig 8 +command line when configuring the interface. .Pp The DHCP client automatically declares this parameter if it used a @@ -391,20 +392,21 @@ .El .Pp These declarations are automatically set in leases acquired by the -DHCP client, but must also be configured in predefined leases \- a +DHCP client, but must also be configured in predefined leases - a predefined lease whose expiry time has passed will not be used by the DHCP client. .Pp Dates are specified as follows: -.Pp -.Ar \ \& +.Bd -ragged -offset indent +.Ar .Sm off .Ar No / Ar No / Ar .Ar : : .Sm on +.Ed .Pp The weekday is present to make it easy for a human to tell when a -lease expires \- it's specified as a number from zero to six, with zero +lease expires - it is specified as a number from zero to six, with zero being Sunday. When declaring a predefined lease, it can always be specified as zero. The year is specified with the century, so it should generally be four @@ -421,7 +423,7 @@ addition to the lease they may acquire via DHCP, their interface also be configured with a predefined IP alias so that they can have a permanent IP address even while roaming. -The Internet Software Consortium DHCP client doesn't support roaming with +The Internet Software Consortium DHCP client does not support roaming with fixed addresses directly, but in order to facilitate such experimentation, the DHCP client can be set up to configure an IP alias using the .Ic alias @@ -436,19 +438,16 @@ declaration for the IP alias address, and a subnet-mask option declaration. A medium statement should never be included in an alias declaration. .Sh OTHER DECLARATIONS -.Bl -tag -width Ds +.Bl -tag -width indent .It Ic reject Ar ip-address ; The .Ic reject statement causes the DHCP client to reject offers from servers who use the specified address as a server identifier. This can be used to avoid being configured by rogue or misconfigured DHCP -servers, although it should be a last resort \- better to track down +servers, although it should be a last resort - better to track down the bad DHCP server and fix it. -.It Xo -.Ic interface Ar \&"name\&" No { Ar declarations -.Ar ... No } -.Xc +.It Ic interface Qo Ar name Qc { Ar declarations ... No } A client with more than one network interface may require different behaviour depending on which interface is being configured. All timing parameters and declarations other than lease and alias @@ -458,10 +457,7 @@ Interfaces for which there is no interface declaration will use the parameters declared outside of any interface declaration, or the default settings. -.It Xo -.Ic media Ar \&"media setup\&" -.Oo , Ar \&"media setup\&" , ... Oc ; -.Xc +.It Ic media Qo Ar "media setup" Qc Oo , Qo Ar "media setup" Qc , Ar ... Oc ; The .Ic media statement defines one or more media configuration parameters which may @@ -469,8 +465,8 @@ The DHCP client will cycle through each media setup string on the list, configuring the interface using that setup and attempting to boot, and then trying the next one. -This can be used for network interfaces which aren't capable of sensing -the media type unaided \- whichever media type succeeds in getting a request +This can be used for network interfaces which are not capable of sensing +the media type unaided - whichever media type succeeds in getting a request to the server and hearing the reply is probably right (no guarantees). .Pp The media setup is only used for the initial phase of address @@ -483,8 +479,11 @@ .El .Sh EXAMPLES The following configuration file is used on a laptop -which has an IP alias of 192.5.5.213, and has one interface, -ep0 (a 3Com 3C589C). +which has an IP alias of +.Li 192.5.5.213 , +and has one interface, +.Li ep0 +(a 3Com 3C589C). Booting intervals have been shortened somewhat from the default, because the client is known to spend most of its time on networks with little DHCP activity. @@ -519,20 +518,24 @@ .Pp This is a very complicated .Nm -file \- in general, yours should be much simpler. -In many cases, it's sufficient to just create an empty +file - in general, yours should be much simpler. +In many cases, it is sufficient to just create an empty .Nm -file \- the defaults are usually fine. +file - the defaults are usually fine. .Sh SEE ALSO .Xr dhclient.leases 5 , +.Xr dhcpd.conf 5 , .Xr dhcp-options 5 , -.Xr dhcpd.conf 5 , .Xr dhclient 8 , .Xr dhcpd 8 -.Pp -RFC 2132, RFC 2131. +.Rs +.%R "RFC 2132, RFC 2131" +.Re .Sh AUTHORS +.An -nosplit +The .Xr dhclient 8 +utility was written by .An Ted Lemon Aq mellon@vix.com under a contract with Vixie Labs. ==== //depot/projects/wifi/sbin/dhclient/dhclient.leases.5#2 (text+ko) ==== @@ -36,6 +36,8 @@ .\" see ``http://www.isc.org/isc''. To learn more about Vixie .\" Enterprises, see ``http://www.vix.com''. .\" +.\" $FreeBSD: src/sbin/dhclient/dhclient.leases.5,v 1.2 2005/06/22 14:55:59 ru Exp $ +.\" .Dd January 1, 1997 .Dt DHCLIENT.LEASES 5 .Os @@ -52,33 +54,39 @@ The file is written as a log, so this is not an unusual occurrence. .Pp The lease file is named -.Qq dhclient.leases.IFNAME , +.Pa dhclient.leases. Ns Ar IFNAME , where -.Qq IFNAME +.Ar IFNAME represents the network interface the DHCP client acquired the lease on. For example, if .Xr dhclient 8 -is configured for the em0 network device, +is configured for the +.Li em0 +network device, the lease file will be named -.Qq dhclient.leases.em0 . +.Pa dhclient.leases.em0 . .Pp The format of the lease declarations is described in .Xr dhclient.conf 5 . .Sh FILES -.Bl -tag -width "/var/db/dhclient.leases.IFNAME " -.It /var/db/dhclient.leases.IFNAME +.Bl -tag -width ".Pa /var/db/dhclient.leases. Ns Ar IFNAME" +.It Pa /var/db/dhclient.leases. Ns Ar IFNAME Current lease file. .El .Sh SEE ALSO .Xr dhclient.conf 5 , +.Xr dhcpd.conf 5 , .Xr dhcp-options 5 , -.Xr dhcpd.conf 5 , .Xr dhclient 8 , .Xr dhcpd 8 -.Pp -RFC 2132, RFC 2131. +.Rs +.%R "RFC 2132, RFC 2131" +.Re .Sh AUTHORS +.An -nosplit +The .Xr dhclient 8 +utility was written by .An Ted Lemon Aq mellon@vix.com under a contract with Vixie Labs. ==== //depot/projects/wifi/sbin/dhclient/dhcp-options.5#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $OpenBSD: dhcp-options.5,v 1.4 2004/04/15 08:59:47 jmc Exp $ +.\" $OpenBSD: dhcp-options.5,v 1.5 2005/03/02 15:30:42 jmc Exp $ .\" .\" Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium. .\" All rights reserved. @@ -36,6 +36,8 @@ .\" see ``http://www.isc.org/isc''. To learn more about Vixie .\" Enterprises, see ``http://www.vix.com''. .\" +.\" $FreeBSD: src/sbin/dhclient/dhcp-options.5,v 1.2 2005/06/22 14:55:59 ru Exp $ +.\" .Dd January 1, 1995 .Dt DHCP-OPTIONS 5 .Os @@ -61,7 +63,7 @@ .Ic option keyword, followed by an option name, followed by option data. The option names and data formats are described below. -It is not necessary to exhaustively specify all DHCP options \- +It is not necessary to exhaustively specify all DHCP options - only those options which are needed by clients must be specified. .Pp Option data comes in a variety of formats, as defined below: @@ -69,7 +71,10 @@ The .Ar ip-address data type can be entered either as an explicit IP address -(e.g., 239.254.197.10) or as a domain name (e.g., haagen.isc.org). +(e.g., +.Li 239.254.197.10 ) +or as a domain name (e.g., +.Li haagen.isc.org ) . A domain name must resolve to a single IP address. .Pp The @@ -96,16 +101,23 @@ .Tn NVT .Pq Network Virtual Terminal .Tn ASCII -string, which must be enclosed in double quotes \- for example, +string, which must be enclosed in double quotes - for example, to specify a domain-name option, the syntax would be .Pp -.Dl option domain-name \&"isc.org\&"; +.Dl option domain-name \&"isc.org"; .Pp The .Ar flag data type specifies a boolean value. -Booleans can be either true or false -(or on or off, if that makes more sense to you). +Booleans can be either >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 15 01:45:44 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E256316A421; Fri, 15 Jul 2005 01:45:43 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9283116A41C for ; Fri, 15 Jul 2005 01:45:43 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D86C43D46 for ; Fri, 15 Jul 2005 01:45:43 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6F1jhoo049483 for ; Fri, 15 Jul 2005 01:45:43 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6F1jhNB049480 for perforce@freebsd.org; Fri, 15 Jul 2005 01:45:43 GMT (envelope-from wsalamon@computer.org) Date: Fri, 15 Jul 2005 01:45:43 GMT Message-Id: <200507150145.j6F1jhNB049480@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 80224 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2005 01:45:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=80224 Change 80224 by wsalamon@gretsch on 2005/07/15 01:45:21 Include libbsm.h from the /usr/include/bsm. Affected files ... .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/include/audittest.h#4 edit Differences ... ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/include/audittest.h#4 (text+ko) ==== @@ -26,9 +26,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include +#include #include -#include #include #include #include From owner-p4-projects@FreeBSD.ORG Fri Jul 15 02:34:48 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D7F0116A420; Fri, 15 Jul 2005 02:34:47 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0FE4E16A41C for ; Fri, 15 Jul 2005 02:34:47 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98F4E43D45 for ; Fri, 15 Jul 2005 02:34:46 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6F2YkQP051446 for ; Fri, 15 Jul 2005 02:34:46 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6F2YjBu051443 for perforce@freebsd.org; Fri, 15 Jul 2005 02:34:45 GMT (envelope-from peter@freebsd.org) Date: Fri, 15 Jul 2005 02:34:45 GMT Message-Id: <200507150234.j6F2YjBu051443@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 80231 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2005 02:34:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=80231 Change 80231 by peter@peter_overcee on 2005/07/15 02:33:59 IFC @80227 Affected files ... .. //depot/projects/hammer/contrib/pf/man/pflog.4#5 integrate .. //depot/projects/hammer/contrib/pf/man/pfsync.4#6 integrate .. //depot/projects/hammer/contrib/pf/pfctl/pfctl.8#4 integrate .. //depot/projects/hammer/etc/etc.powerpc/ttys#2 integrate .. //depot/projects/hammer/lib/Makefile#50 integrate .. //depot/projects/hammer/lib/libc/gen/sem_init.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/sem_post.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/sem_wait.3#3 integrate .. //depot/projects/hammer/lib/libcam/camlib.c#3 integrate .. //depot/projects/hammer/lib/libmemstat/Makefile#1 branch .. //depot/projects/hammer/lib/libmemstat/libmemstat.3#1 branch .. //depot/projects/hammer/lib/libmemstat/memstat.c#1 branch .. //depot/projects/hammer/lib/libmemstat/memstat.h#1 branch .. //depot/projects/hammer/lib/libmemstat/memstat_all.c#1 branch .. //depot/projects/hammer/lib/libmemstat/memstat_internal.h#1 branch .. //depot/projects/hammer/lib/libmemstat/memstat_malloc.c#1 branch .. //depot/projects/hammer/lib/libmemstat/memstat_uma.c#1 branch .. //depot/projects/hammer/lib/libpmc/pmc.3#5 integrate .. //depot/projects/hammer/sbin/devd/devd.cc#13 integrate .. //depot/projects/hammer/sbin/geom/class/raid3/geom_raid3.c#11 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#26 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#26 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.h#10 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#13 integrate .. //depot/projects/hammer/sbin/startslip/startslip.1#4 integrate .. //depot/projects/hammer/sbin/sysctl/sysctl.8#10 integrate .. //depot/projects/hammer/share/man/man4/Makefile#73 integrate .. //depot/projects/hammer/share/man/man4/agp.4#5 integrate .. //depot/projects/hammer/share/man/man4/awi.4#8 integrate .. //depot/projects/hammer/share/man/man4/if_bridge.4#4 integrate .. //depot/projects/hammer/share/man/man4/kbdmux.4#1 branch .. //depot/projects/hammer/share/man/man4/witness.4#7 integrate .. //depot/projects/hammer/share/man/man7/development.7#7 integrate .. //depot/projects/hammer/share/man/man7/firewall.7#11 integrate .. //depot/projects/hammer/share/man/man7/ports.7#14 integrate .. //depot/projects/hammer/share/man/man7/security.7#12 integrate .. //depot/projects/hammer/sys/alpha/conf/GENERIC#29 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_proto.h#13 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_syscall.h#13 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_sysent.c#13 integrate .. //depot/projects/hammer/sys/alpha/linux/syscalls.master#13 integrate .. //depot/projects/hammer/sys/alpha/osf1/Makefile#2 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_proto.h#8 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_syscall.h#8 integrate .. //depot/projects/hammer/sys/alpha/osf1/osf1_sysent.c#8 integrate .. //depot/projects/hammer/sys/alpha/osf1/syscalls.master#8 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#75 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#46 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_proto.h#5 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_syscall.h#5 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysent.c#5 integrate .. //depot/projects/hammer/sys/amd64/linux32/syscalls.master#5 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/Makefile#15 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/libi386.h#9 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/hammer/sys/boot/i386/loader/main.c#9 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#31 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#30 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#28 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#28 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#28 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#32 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4.h#4 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_proto.h#6 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_stream.c#16 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_syscall.h#6 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_syscallnames.c#6 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sysent.c#6 integrate .. //depot/projects/hammer/sys/compat/svr4/syscalls.master#6 integrate .. //depot/projects/hammer/sys/conf/NOTES#94 integrate .. //depot/projects/hammer/sys/conf/files#117 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.c#16 integrate .. //depot/projects/hammer/sys/dev/aac/aac_pci.c#22 integrate .. //depot/projects/hammer/sys/dev/advansys/adv_isa.c#10 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#25 integrate .. //depot/projects/hammer/sys/dev/ep/if_epvar.h#10 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex_pccard.c#10 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_ppro.c#6 integrate .. //depot/projects/hammer/sys/dev/kbd/kbd.c#11 integrate .. //depot/projects/hammer/sys/dev/kbd/kbdreg.h#4 integrate .. //depot/projects/hammer/sys/dev/kbdmux/kbdmux.c#1 branch .. //depot/projects/hammer/sys/dev/pccard/pccard.c#26 integrate .. //depot/projects/hammer/sys/dev/pccard/pccard_cis.c#13 integrate .. //depot/projects/hammer/sys/dev/pccard/pccard_cis.h#4 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#36 integrate .. //depot/projects/hammer/sys/dev/pccard/pccardvar.h#16 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#33 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbbvar.h#9 integrate .. //depot/projects/hammer/sys/dev/sn/if_sn_pccard.c#11 integrate .. //depot/projects/hammer/sys/dev/sn/ositech.h#1 branch .. //depot/projects/hammer/sys/dev/sound/isa/mss.c#13 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#32 integrate .. //depot/projects/hammer/sys/dev/usb/sl811hs.c#1 branch .. //depot/projects/hammer/sys/dev/usb/sl811hsreg.h#1 branch .. //depot/projects/hammer/sys/dev/usb/sl811hsvar.h#1 branch .. //depot/projects/hammer/sys/dev/usb/slhci_pccard.c#1 branch .. //depot/projects/hammer/sys/dev/usb/usb.c#16 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe.c#22 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe_pccard.c#17 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_devs.c#12 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#35 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#38 integrate .. //depot/projects/hammer/sys/i386/i386/exception.s#11 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#63 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#38 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_isc_syscall.h#5 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_isc_sysent.c#6 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_proto.h#7 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_syscall.h#7 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_sysent.c#9 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_xenix.h#5 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_xenix_syscall.h#5 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_xenix_sysent.c#6 integrate .. //depot/projects/hammer/sys/i386/ibcs2/syscalls.isc#5 integrate .. //depot/projects/hammer/sys/i386/ibcs2/syscalls.master#7 integrate .. //depot/projects/hammer/sys/i386/ibcs2/syscalls.xenix#5 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#28 integrate .. //depot/projects/hammer/sys/i386/linux/linux_proto.h#16 integrate .. //depot/projects/hammer/sys/i386/linux/linux_syscall.h#16 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysent.c#17 integrate .. //depot/projects/hammer/sys/i386/linux/syscalls.master#16 integrate .. //depot/projects/hammer/sys/i386/pci/pci_pir.c#9 integrate .. //depot/projects/hammer/sys/ia64/conf/GENERIC#21 integrate .. //depot/projects/hammer/sys/kern/Makefile#3 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#33 integrate .. //depot/projects/hammer/sys/kern/kern_mac.c#33 integrate .. //depot/projects/hammer/sys/kern/kern_malloc.c#25 integrate .. //depot/projects/hammer/sys/kern/tty_pty.c#28 integrate .. //depot/projects/hammer/sys/modules/Makefile#83 integrate .. //depot/projects/hammer/sys/modules/ed/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/ep/Makefile#7 integrate .. //depot/projects/hammer/sys/modules/kbdmux/Makefile#1 branch .. //depot/projects/hammer/sys/modules/slhci/Makefile#1 branch .. //depot/projects/hammer/sys/net/if.c#50 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#6 integrate .. //depot/projects/hammer/sys/netinet/in_proto.c#16 integrate .. //depot/projects/hammer/sys/nfs/nfs_common.c#7 integrate .. //depot/projects/hammer/sys/nfs/nfs_common.h#5 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#27 integrate .. //depot/projects/hammer/sys/pc98/cbus/clock.c#4 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#33 integrate .. //depot/projects/hammer/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#52 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#23 integrate .. //depot/projects/hammer/sys/security/mac/mac_vfs.c#8 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#35 integrate .. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#24 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#34 integrate .. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#17 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#35 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#40 integrate .. //depot/projects/hammer/sys/sys/cdefs.h#20 integrate .. //depot/projects/hammer/sys/sys/conf.h#33 integrate .. //depot/projects/hammer/sys/sys/kbio.h#2 integrate .. //depot/projects/hammer/sys/sys/mac.h#27 integrate .. //depot/projects/hammer/sys/sys/mac_policy.h#29 integrate .. //depot/projects/hammer/sys/sys/malloc.h#11 integrate .. //depot/projects/hammer/sys/vm/uma.h#11 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#40 integrate .. //depot/projects/hammer/sys/vm/uma_int.h#18 integrate .. //depot/projects/hammer/sys/vm/vm_fault.c#31 integrate .. //depot/projects/hammer/tools/tools/nanobsd/i386.diskimage#13 integrate .. //depot/projects/hammer/usr.bin/ee/ee.1#5 integrate .. //depot/projects/hammer/usr.bin/enigma/enigma.1#5 integrate .. //depot/projects/hammer/usr.bin/env/envopts.c#3 integrate .. //depot/projects/hammer/usr.bin/netstat/if.c#8 integrate .. //depot/projects/hammer/usr.bin/netstat/main.c#13 integrate .. //depot/projects/hammer/usr.bin/netstat/netstat.h#9 integrate .. //depot/projects/hammer/usr.bin/rsh/rsh.1#4 integrate .. //depot/projects/hammer/usr.bin/tip/tip/tip.1#4 integrate .. //depot/projects/hammer/usr.bin/uuencode/uuencode.1#6 integrate .. //depot/projects/hammer/usr.sbin/burncd/burncd.8#13 integrate .. //depot/projects/hammer/usr.sbin/kbdcontrol/kbdcontrol.1#5 integrate .. //depot/projects/hammer/usr.sbin/kbdcontrol/kbdcontrol.c#4 integrate .. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.8#5 integrate .. //depot/projects/hammer/usr.sbin/tcpdrop/tcpdrop.8#3 integrate .. //depot/projects/hammer/usr.sbin/wpa/wpa_cli/wpa_cli.8#3 integrate .. //depot/projects/hammer/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#4 integrate Differences ... ==== //depot/projects/hammer/contrib/pf/man/pflog.4#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/contrib/pf/man/pflog.4,v 1.4 2005/05/03 16:55:20 mlaier Exp $ +.\" $FreeBSD: src/contrib/pf/man/pflog.4,v 1.5 2005/07/14 20:29:05 brueffer Exp $ .\" .Dd December 10, 2001 .Dt PFLOG 4 @@ -41,7 +41,7 @@ .Xr pf 4 . Logged packets can easily be monitored in real time by invoking -.Xr tcpdump 8 +.Xr tcpdump 1 on the .Nm interface, or stored to disk using @@ -75,13 +75,13 @@ # tcpdump -n -e -ttt -i pflog0 .Ed .Sh SEE ALSO +.Xr tcpdump 1 .Xr inet 4 , .Xr inet6 4 , .Xr netintro 4 , .Xr pf 4 , .Xr ifconfig 8 , -.Xr pflogd 8 , -.Xr tcpdump 8 +.Xr pflogd 8 .Sh HISTORY The .Nm ==== //depot/projects/hammer/contrib/pf/man/pfsync.4#6 (text+ko) ==== @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/contrib/pf/man/pfsync.4,v 1.5 2005/05/03 16:55:20 mlaier Exp $ +.\" $FreeBSD: src/contrib/pf/man/pfsync.4,v 1.6 2005/07/14 20:29:05 brueffer Exp $ .\" .Dd February 23, 2005 .Dt PFSYNC 4 @@ -210,7 +210,7 @@ .Ed .Sh BUGS Possibility to view state changes using -.Xr tcpdump 8 +.Xr tcpdump 1 has not been ported from .Ox yet. ==== //depot/projects/hammer/contrib/pf/pfctl/pfctl.8#4 (text+ko) ==== @@ -24,6 +24,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" +.\" $FreeBSD: src/contrib/pf/pfctl/pfctl.8,v 1.2 2005/07/14 20:29:05 brueffer Exp $ +.\" .Dd November 20, 2002 .Dt PFCTL 8 .Os @@ -83,7 +85,7 @@ is set to .Dv YES in -.Xr rc.conf.local 8 , +.Xr rc.conf.local 5 , the rule file specified with the variable .Va pf_rules is loaded automatically by the @@ -594,11 +596,11 @@ .Xr pf 4 , .Xr pf.conf 5 , .Xr pf.os 5 , +.Xr rc.conf 5 , .Xr sysctl.conf 5 , .Xr authpf 8 , .Xr ftp-proxy 8 , .Xr rc 8 , -.Xr rc.conf 8 , .Xr sysctl 8 .Sh HISTORY The ==== //depot/projects/hammer/etc/etc.powerpc/ttys#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.powerpc/ttys,v 1.1 2004/02/04 01:44:34 grehan Exp $ +# $FreeBSD: src/etc/etc.powerpc/ttys,v 1.2 2005/07/14 07:08:49 grehan Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -32,9 +32,11 @@ # when going to single-user mode. console none unknown off secure # +# ofw_console(4) screen "/usr/libexec/getty Pc" cons25 on secure -ttya "/usr/libexec/getty 3wire.9600" cons25 on secure -ttyb "/usr/libexec/getty 3wire.9600" cons25 off secure +# zs(4) +ttyy0 "/usr/libexec/getty std.9600" cons25 on secure +ttyy1 "/usr/libexec/getty std.9600" cons25 off secure # ttyv0 "/usr/libexec/getty Pc" cons25 on secure # Virtual terminals ==== //depot/projects/hammer/lib/Makefile#50 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.205 2005/04/20 20:50:32 marcel Exp $ +# $FreeBSD: src/lib/Makefile,v 1.206 2005/07/14 17:59:50 rwatson Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -29,7 +29,7 @@ libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \ libedit libexpat libfetch libform libftpio libgeom ${_libgpib} \ ${_libio} libipsec \ - libipx libkiconv libmagic libmenu ${_libmilter} ${_libmp} \ + libipx libkiconv libmagic libmemstat libmenu ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpanel libpcap \ libpmc ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \ ==== //depot/projects/hammer/lib/libc/gen/sem_init.3#3 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/sem_init.3,v 1.17 2004/07/02 16:45:56 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/sem_init.3,v 1.18 2005/07/13 13:15:21 rwatson Exp $ .\" .Dd February 15, 2000 .Dt SEM_INIT 3 @@ -83,6 +83,7 @@ .El .Sh SEE ALSO .Xr sem_destroy 3 , +.Xr sem_getvalue 3 , .Xr sem_post 3 , .Xr sem_trywait 3 , .Xr sem_wait 3 , ==== //depot/projects/hammer/lib/libc/gen/sem_post.3#3 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/sem_post.3,v 1.14 2004/07/02 16:45:56 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/sem_post.3,v 1.15 2005/07/13 13:15:21 rwatson Exp $ .\" .Dd February 15, 2000 .Dt SEM_POST 3 @@ -67,6 +67,7 @@ points to an invalid semaphore. .El .Sh SEE ALSO +.Xr sem_getvalue 3 , .Xr sem_trywait 3 , .Xr sem_wait 3 , .Xr sem 4 ==== //depot/projects/hammer/lib/libc/gen/sem_wait.3#3 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/sem_wait.3,v 1.12 2004/07/02 16:45:56 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/sem_wait.3,v 1.13 2005/07/13 13:15:22 rwatson Exp $ .\" .Dd February 15, 2000 .Dt SEM_WAIT 3 @@ -82,6 +82,7 @@ The semaphore value was zero, and thus could not be decremented. .El .Sh SEE ALSO +.Xr sem_getvalue 3 , .Xr sem_post 3 , .Xr sem 4 .Sh STANDARDS ==== //depot/projects/hammer/lib/libcam/camlib.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libcam/camlib.c,v 1.12 2004/07/29 15:35:45 scottl Exp $"); +__FBSDID("$FreeBSD: src/lib/libcam/camlib.c,v 1.13 2005/07/13 10:40:07 delphij Exp $"); #include #include @@ -97,8 +97,7 @@ void cam_freeccb(union ccb *ccb) { - if (ccb != NULL) - free(ccb); + free(ccb); } /* @@ -708,8 +707,7 @@ cam_close_spec_device(dev); - if (dev != NULL) - free(dev); + free(dev); } void @@ -757,6 +755,11 @@ } newdev = malloc(sizeof(struct cam_device)); + if (newdev == NULL) { + snprintf(cam_errbuf, CAM_ERRBUF_SIZE, + "%s: couldn't malloc CAM device structure", func_name); + return(NULL); + } bcopy(device, newdev, sizeof(struct cam_device)); ==== //depot/projects/hammer/lib/libpmc/pmc.3#5 (text+ko) ==== @@ -21,7 +21,7 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.5 2005/06/24 16:56:24 ru Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.6 2005/07/14 20:29:05 brueffer Exp $ .\" .Dd June 24, 2005 .Os @@ -3383,7 +3383,6 @@ .Xr pmclog 3 , .Xr hwpmc 4 , .Xr pmccontrol 8 , -.Xr pmcreport 8 , .Xr pmcstat 8 .Sh BUGS The information returned by ==== //depot/projects/hammer/sbin/devd/devd.cc#13 (text+ko) ==== @@ -34,7 +34,7 @@ // - devd.conf needs more details on the supported statements. #include -__FBSDID("$FreeBSD: src/sbin/devd/devd.cc,v 1.22 2005/07/10 03:37:15 imp Exp $"); +__FBSDID("$FreeBSD: src/sbin/devd/devd.cc,v 1.24 2005/07/13 17:28:11 marcus Exp $"); #include #include @@ -672,11 +672,13 @@ strlcpy(sun.sun_path, name, sizeof(sun.sun_path)); slen = SUN_LEN(&sun); unlink(name); + if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0) + err(1, "fcntl"); if (bind(fd, (struct sockaddr *) & sun, slen) < 0) err(1, "bind"); listen(fd, 4); - fchown(fd, 0, 0); /* XXX - root.wheel */ - fchmod(fd, 0660); + chown(name, 0, 0); /* XXX - root.wheel */ + chmod(name, 0666); return (fd); } ==== //depot/projects/hammer/sbin/geom/class/raid3/geom_raid3.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/geom/class/raid3/geom_raid3.c,v 1.11 2005/03/14 14:25:47 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/raid3/geom_raid3.c,v 1.12 2005/07/13 07:46:55 pjd Exp $"); #include #include @@ -173,6 +173,7 @@ return; } strlcpy(md.md_name, str, sizeof(md.md_name)); + md.md_id = arc4random(); md.md_all = *nargs - 1; md.md_mflags = 0; md.md_dflags = 0; ==== //depot/projects/hammer/sbin/ifconfig/ifconfig.8#26 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.95 2005/07/06 15:39:11 sam Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.98 2005/07/14 18:33:21 rwatson Exp $ .\" -.Dd July 5, 2005 +.Dd July 11, 2005 .Dt IFCONFIG 8 .Os .Sh NAME @@ -37,6 +37,7 @@ .Sh SYNOPSIS .Nm .Op Fl L +.Op Fl k .Op Fl m .Ar interface .Op Cm create @@ -65,6 +66,7 @@ .Nm .Op Fl L .Op Fl d +.Op Fl k .Op Fl m .Op Fl u .Op Fl v @@ -751,6 +753,34 @@ .It Cm scan Display the current set of scanned neighbors and/or trigger a new scan. Only the super-user can trigger a scan. +Depending on the capabilities of the APs, the following +flags can be included in the output: +.Bl -tag -width 3n +.It Li E +Extended Service Set (ESS). +Indicates that the station is part of an infrastructure network +(in contrast to an IBSS/ad-hoc network). +.It Li I +IBSS/ad-hoc network. +Indicates that the station is part of an ad-hoc network +(in contrast to an ESS network). +.It Li P +Privacy. +Data confidentiality is required for all data type frames +exchanged within the BSS. +This means that this BSS requires the station to +use cryptographic means such as WEP, TKIP or AES-CCMP to +encrypt/decrypt data frames being exchanged with others. +.It Li S +Short Preamble. +Indicates that the network is using short preambles (defined +in 802.11b High Rate/DSSS PHY, short preamble utilizes a +56 bit sync field in contrast to a 128 bit field used in long +preamble mode). +.It Li s +Short slot time. +Indicates that the network supports short slot time. +.El .It Cm stationname Ar name Set the name of this station. It appears that the station name is not really part of the IEEE 802.11 @@ -1043,6 +1073,15 @@ the system, with no additional information. Use of this flag is mutually exclusive with all other flags and commands. .Pp +The +.Fl k +flag causes keying information for the interface, if available, to be +printed. +For example, the values of 802.11 WEP keys will be printed, if accessible to +the current user. +This information is not printed by default, as it may be considered +sensitive. +.Pp Only the super-user may modify the configuration of a network interface. .Sh NOTES The media selection system is relatively new and only some drivers support ==== //depot/projects/hammer/sbin/ifconfig/ifconfig.c#26 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.113 2005/05/20 03:58:53 sam Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.115 2005/07/14 18:33:21 rwatson Exp $"; #endif /* not lint */ #include @@ -91,6 +91,7 @@ int verbose; int supmedia = 0; +int printkeys = 0; /* Print keying material for interfaces. */ int printname = 0; /* Print the name of the created interface. */ static int ifconfig(int argc, char *const *argv, const struct afswtch *afp); @@ -156,7 +157,7 @@ all = downonly = uponly = namesonly = verbose = 0; /* Parse leading line options */ - strlcpy(options, "adlmuv", sizeof(options)); + strlcpy(options, "adklmuv", sizeof(options)); for (p = opts; p != NULL; p = p->next) strlcat(options, p->opt, sizeof(options)); while ((c = getopt(argc, argv, options)) != -1) { @@ -167,6 +168,9 @@ case 'd': /* restrict scan to "down" interfaces */ downonly++; break; + case 'k': + printkeys++; + break; case 'l': /* scan interface names only */ namesonly++; break; @@ -809,7 +813,7 @@ #define IFFBITS \ "\020\1UP\2BROADCAST\3DEBUG\4LOOPBACK\5POINTOPOINT\6SMART\7RUNNING" \ "\10NOARP\11PROMISC\12ALLMULTI\13OACTIVE\14SIMPLEX\15LINK0\16LINK1\17LINK2" \ -"\20MULTICAST\21POLLING\23MONITOR\24STATICARP" +"\20MULTICAST\21POLLING\22PPROMISC\23MONITOR\24STATICARP\25NEEDSGIANT" #define IFCAPBITS \ "\020\1RXCSUM\2TXCSUM\3NETCONS\4VLAN_MTU\5VLAN_HWTAGGING\6JUMBO_MTU\7POLLING" ==== //depot/projects/hammer/sbin/ifconfig/ifconfig.h#10 (text+ko) ==== @@ -31,7 +31,7 @@ * * so there! * - * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.16 2005/04/08 21:37:41 stefanf Exp $ + * $FreeBSD: src/sbin/ifconfig/ifconfig.h,v 1.17 2005/07/14 18:33:21 rwatson Exp $ */ #define __constructor __attribute__((constructor)) @@ -126,6 +126,7 @@ extern char name[IFNAMSIZ]; /* name of interface */ extern int allmedia; extern int supmedia; +extern int printkeys; extern int printname; extern int flags; extern int newaddr; ==== //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#13 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.18 2005/07/06 15:39:11 sam Exp $ + * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.19 2005/07/14 18:33:21 rwatson Exp $ */ /*- @@ -1224,7 +1224,7 @@ int keylen = ik->ik_keylen; int printcontents; - printcontents = + printcontents = printkeys && (memcmp(ik->ik_keydata, zerodata, keylen) != 0 || verbose); if (printcontents) LINE_BREAK(); ==== //depot/projects/hammer/sbin/startslip/startslip.1#4 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)startslip.1 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/sbin/startslip/startslip.1,v 1.23 2004/07/02 21:45:05 ru Exp $ +.\" $FreeBSD: src/sbin/startslip/startslip.1,v 1.24 2005/07/14 20:29:05 brueffer Exp $ .\" .Dd June 5, 1993 .Dt STARTSLIP 1 @@ -203,7 +203,7 @@ .It Pa /usr/share/examples/startslip/* .El .Sh SEE ALSO -.Xr uustat 1 , +.Xr uustat 1 Pq Pa ports/net/freebsd-uucp , .Xr slattach 8 , .Xr sliplogin 8 .Sh HISTORY ==== //depot/projects/hammer/sbin/sysctl/sysctl.8#10 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)sysctl.8 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/sbin/sysctl/sysctl.8,v 1.57 2005/01/18 10:09:38 ru Exp $ +.\" $FreeBSD: src/sbin/sysctl/sysctl.8,v 1.58 2005/07/14 20:29:06 brueffer Exp $ .\" .Dd March 10, 2002 .Dt SYSCTL 8 @@ -87,7 +87,7 @@ This is particularly useful with shells that offer programmable completion. To enable completion of variable names in -.Xr zsh 1 , +.Xr zsh 1 Pq Pa ports/shells/zsh , use the following code: .Bd -literal -offset indent listsysctls () { set -A reply $(sysctl -AN ${1%.*}) } ==== //depot/projects/hammer/share/man/man4/Makefile#73 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.320 2005/06/10 08:44:19 glebius Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.322 2005/07/14 23:04:22 emax Exp $ MAN= aac.4 \ acpi.4 \ @@ -122,6 +122,7 @@ ixgb.4 \ joy.4 \ kame.4 \ + kbdmux.4 \ keyboard.4 \ kld.4 \ ktr.4 \ @@ -405,6 +406,7 @@ MLINKS+=fd.4 stderr.4 \ fd.4 stdin.4 \ fd.4 stdout.4 +MLINKS+=firewire.4 ieee1394.4 MLINKS+=fpa.4 fea.4 MLINKS+=fwe.4 if_fwe.4 MLINKS+=fwip.4 if_fwip.4 ==== //depot/projects/hammer/share/man/man4/agp.4#5 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/agp.4,v 1.6 2003/09/08 19:57:19 ru Exp $ +.\" $FreeBSD: src/share/man/man4/agp.4,v 1.7 2005/07/14 20:29:06 brueffer Exp $ .\" .Dd October 5, 2001 .Dt AGP 4 @@ -163,7 +163,7 @@ AGP device node. .El .Sh SEE ALSO -.Xr XFree86 1 +.Xr X 7 Pq Pa ports/x11/xorg .Sh HISTORY The .Nm ==== //depot/projects/hammer/share/man/man4/awi.4#8 (text+ko) ==== @@ -1,5 +1,5 @@ .\" $NetBSD: awi.4,v 1.6 2000/03/22 11:24:33 onoe Exp $ -.\" $FreeBSD: src/share/man/man4/awi.4,v 1.18 2005/02/13 22:25:17 ru Exp $ +.\" $FreeBSD: src/share/man/man4/awi.4,v 1.19 2005/07/14 20:29:06 brueffer Exp $ .\" .Dd October 31, 1999 .Dt AWI 4 @@ -41,7 +41,7 @@ .Nm driver also supports a variant of adhoc mode out of spec for DS radio cards, which makes it possible to communicate with adhoc mode of -.Xr wi 8 +.Xr wi 4 driver. The NWID does not affect in this mode. .Pp ==== //depot/projects/hammer/share/man/man4/if_bridge.4#4 (text+ko) ==== @@ -33,7 +33,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/if_bridge.4,v 1.5 2005/06/27 10:58:22 thompsa Exp $ +.\" $FreeBSD: src/share/man/man4/if_bridge.4,v 1.6 2005/07/13 20:40:19 thompsa Exp $ .\" .Dd June 10, 2005 .Dt IF_BRIDGE 4 @@ -133,6 +133,9 @@ Note that packets to and from the bridging host will be seen by the filter on the interface with the appropriate address configured as well as on the interface on which the packet arrives or departs. +.Pp +The MTU of the first member interface to be added is used as the bridge MTU, +all additional members are required to have exactly the same value. .Sh EXAMPLES The following when placed in the file .Pa /etc/rc.conf ==== //depot/projects/hammer/share/man/man4/witness.4#7 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/witness.4,v 1.9 2005/06/15 13:31:22 ru Exp $ +.\" $FreeBSD: src/share/man/man4/witness.4,v 1.10 2005/07/13 21:12:06 yar Exp $ .\" .Dd February 18, 2001 .Dt WITNESS 4 @@ -98,6 +98,7 @@ A value of 0 specifies that witness is disabled. This sysctl can be written to in order to disable witness, however it may not be used to enable witness. +The sysctl .Va debug.witness.watch can be set via .Xr loader 8 . @@ -124,6 +125,8 @@ .El .Sh SEE ALSO .Xr ddb 4 , +.Xr loader 8 , +.Xr sysctl 8 , .Xr mutex 9 .Sh HISTORY The ==== //depot/projects/hammer/share/man/man7/development.7#7 (text+ko) ==== @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/development.7,v 1.14 2005/01/15 11:12:40 ru Exp $ +.\" $FreeBSD: src/share/man/man7/development.7,v 1.15 2005/07/14 20:29:06 brueffer Exp $ .\" .Dd December 21, 2002 .Dt DEVELOPMENT 7 @@ -89,7 +89,7 @@ partition of at least 5GB. .Pp On the master server, use -.Xr cvsup 1 +.Xr cvsup 1 Pq Pa ports/net/cvsup to automatically pull down and maintain the .Fx ==== //depot/projects/hammer/share/man/man7/firewall.7#11 (text+ko) ==== @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/firewall.7,v 1.25 2005/02/13 23:45:50 ru Exp $ +.\" $FreeBSD: src/share/man/man7/firewall.7,v 1.26 2005/07/14 20:29:06 brueffer Exp $ .\" .Dd May 26, 2001 .Dt FIREWALL 7 @@ -410,7 +410,6 @@ .Xr jail 8 to indirectly bind services that do not otherwise give you the option. .Sh SEE ALSO -.Xr ipnat 1 , .Xr dummynet 4 , .Xr ipnat 5 , .Xr rc.conf 5 , @@ -418,6 +417,7 @@ .Xr samba 7 Pq Pa ports/net/samba , .Xr config 8 , .Xr ipfw 8 , +.Xr ipnat 8 , .Xr jail 8 , .Xr natd 8 , .Xr nfsd 8 ==== //depot/projects/hammer/share/man/man7/ports.7#14 (text+ko) ==== @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/ports.7,v 1.50 2005/02/07 23:04:33 krion Exp $ +.\" $FreeBSD: src/share/man/man7/ports.7,v 1.51 2005/07/14 20:29:06 brueffer Exp $ .\" .Dd February 8, 2005 .Dt PORTS 7 @@ -66,7 +66,7 @@ .Pa http://www.FreeBSD.org/ports/ first! The -.Xr portcheckout 1 +.Xr portcheckout 1 Pq Pa ports/devel/portcheckout script (also a port, of course!) will help to download new ports. .Pp For more information about using ports, see @@ -443,7 +443,7 @@ variables. .It Va DISABLE_VULNERABILITIES If defined, disable check for security vulnerabilities using -.Xr portaudit 1 +.Xr portaudit 1 Pq Pa ports/security/portaudit when installing new ports. .El .Sh FILES @@ -470,6 +470,7 @@ The following are part of the ports collection: .Pp .Xr pib 1 , +.Xr portaudit 1 , .Xr portcheckout 1 , .Xr portlint 1 .Rs ==== //depot/projects/hammer/share/man/man7/security.7#12 (text+ko) ==== @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/security.7,v 1.41 2005/01/21 12:01:00 ru Exp $ +.\" $FreeBSD: src/share/man/man7/security.7,v 1.42 2005/07/14 20:29:06 brueffer Exp $ .\" .Dd November 29, 2004 .Dt SECURITY 7 @@ -326,7 +326,7 @@ running an old version of .Xr imapd 8 or -.Xr popper 8 +.Xr popper 8 Pq Pa ports/mail/popper is like giving a universal root ticket out to the entire world. Never run a server that you have not checked @@ -404,7 +404,7 @@ Still, root holes are occasionally found in these binaries. A root hole was found in Xlib in 1998 that made -.Xr xterm 1 +.Xr xterm 1 Pq Pa ports/x11/xterm (which is typically SUID) vulnerable. It is better to be safe than sorry and the prudent sysadmin will restrict SUID @@ -945,7 +945,7 @@ .Xr netstat 1 , .Xr openssl 1 , .Xr ssh 1 , -.Xr xdm 1 , +.Xr xdm 1 Pq Pa ports/x11/xorg-clients , .Xr group 5 , .Xr ttys 5 , .Xr accton 8 , ==== //depot/projects/hammer/sys/alpha/conf/GENERIC#29 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.186 2005/06/06 10:53:10 wilko Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.187 2005/07/14 15:39:04 kensmith Exp $ machine alpha cpu EV4 @@ -63,6 +63,7 @@ options GEOM_GPT # GUID Partition Tables. options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 # Compatible with FreeBSD4 +options COMPAT_FREEBSD5 # Compatible with FreeBSD5 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options SYSVSHM # SYSV-style shared memory ==== //depot/projects/hammer/sys/alpha/linux/linux_proto.h#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.22 2005/06/08 20:47:30 sobomax Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.63 2005/06/08 20:41:27 sobomax Exp + * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.23 2005/07/13 20:35:07 jhb Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.64 2005/07/13 20:32:41 jhb Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/hammer/sys/alpha/linux/linux_syscall.h#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.20 2005/06/08 20:47:30 sobomax Exp $ - * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.63 2005/06/08 20:41:27 sobomax Exp + * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.21 2005/07/13 20:35:07 jhb Exp $ + * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.64 2005/07/13 20:32:41 jhb Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/hammer/sys/alpha/linux/linux_sysent.c#13 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 15 02:42:58 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E460116A420; Fri, 15 Jul 2005 02:42:57 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BE11916A41C for ; Fri, 15 Jul 2005 02:42:57 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8FF6C43D46 for ; Fri, 15 Jul 2005 02:42:57 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6F2gvrH051774 for ; Fri, 15 Jul 2005 02:42:57 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6F2gvtx051771 for perforce@freebsd.org; Fri, 15 Jul 2005 02:42:57 GMT (envelope-from peter@freebsd.org) Date: Fri, 15 Jul 2005 02:42:57 GMT Message-Id: <200507150242.j6F2gvtx051771@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 80233 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2005 02:42:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=80233 Change 80233 by peter@peter_overcee on 2005/07/15 02:42:26 Integ -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/exception.S#42 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#139 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#70 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#76 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#47 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/exception.S#42 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#139 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#70 (text+ko) ==== @@ -219,9 +219,9 @@ type); /* * We shouldn't enable interrupts while in a critical - * section. + * section or servicing an NMI. */ - if (td->td_critnest == 0) + if (type != T_NMI && td->td_critnest == 0) enable_intr(); } } ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#76 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/isa/clock.c#47 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Jul 15 03:05:49 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCEE416A420; Fri, 15 Jul 2005 03:05:48 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 61F2916A41C for ; Fri, 15 Jul 2005 03:05:48 +0000 (GMT) (envelope-from soc-yanjun@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1A9C43D46 for ; Fri, 15 Jul 2005 03:05:47 +0000 (GMT) (envelope-from soc-yanjun@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6F35lpJ052671 for ; Fri, 15 Jul 2005 03:05:47 GMT (envelope-from soc-yanjun@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6F35kEj052668 for perforce@freebsd.org; Fri, 15 Jul 2005 03:05:46 GMT (envelope-from soc-yanjun@freebsd.org) Date: Fri, 15 Jul 2005 03:05:46 GMT Message-Id: <200507150305.j6F35kEj052668@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-yanjun@freebsd.org using -f From: soc-yanjun To: Perforce Change Reviews Cc: Subject: PERFORCE change 80234 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2005 03:05:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=80234 Change 80234 by soc-yanjun@wyj on 2005/07/15 03:04:52 Submit for test after first integrate. Affected files ... .. //depot/projects/soc2005/sebsd/src/COPYRIGHT#1 branch .. //depot/projects/soc2005/sebsd/src/MAINTAINERS#1 branch .. //depot/projects/soc2005/sebsd/src/MERGE#1 branch .. //depot/projects/soc2005/sebsd/src/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/Makefile.inc1#1 branch .. //depot/projects/soc2005/sebsd/src/README#1 branch .. //depot/projects/soc2005/sebsd/src/SEBSD-Installation.txt#1 branch .. //depot/projects/soc2005/sebsd/src/SEBSD.txt#1 branch .. //depot/projects/soc2005/sebsd/src/UPDATING#1 branch .. //depot/projects/soc2005/sebsd/src/UPDATING.64BTT#1 branch .. //depot/projects/soc2005/sebsd/src/bin/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/Makefile.inc#1 branch .. //depot/projects/soc2005/sebsd/src/bin/cat/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/cat/cat.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/cat/cat.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/chflags/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/chflags/chflags.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/chflags/chflags.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/chio/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/chio/chio.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/chio/chio.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/chio/defs.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/chio/pathnames.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/chmod/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/chmod/chmod.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/chmod/chmod.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/cp/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/cp/cp.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/cp/cp.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/cp/extern.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/cp/utils.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/csh/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/soc2005/sebsd/src/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/soc2005/sebsd/src/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/soc2005/sebsd/src/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/soc2005/sebsd/src/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/soc2005/sebsd/src/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/soc2005/sebsd/src/bin/csh/config.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/csh/config_p.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/csh/host.defs#1 branch .. //depot/projects/soc2005/sebsd/src/bin/date/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/date/date.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/date/date.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/date/extern.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/date/netdate.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/date/vary.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/date/vary.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/dd/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/dd/args.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/dd/conv.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/dd/conv_tab.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/dd/dd.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/dd/dd.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/dd/dd.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/dd/extern.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/dd/gen.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/dd/misc.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/dd/position.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.ascii#1 branch .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.ebcdic#1 branch .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.ibm#1 branch .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.lcase#1 branch .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.oldascii#1 branch .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.oldebcdic#1 branch .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.oldibm#1 branch .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.pareven#1 branch .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.parnone#1 branch .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.parodd#1 branch .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.parset#1 branch .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.swab#1 branch .. //depot/projects/soc2005/sebsd/src/bin/dd/ref.ucase#1 branch .. //depot/projects/soc2005/sebsd/src/bin/df/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/df/df.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/df/df.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/domainname/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/domainname/domainname.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/domainname/domainname.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/echo/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/echo/echo.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/echo/echo.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/POSIX#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/README#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/buf.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/cbc.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/ed.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/ed.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/glbl.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/io.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/main.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/re.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/sub.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/=.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/README#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/TODO#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/a.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/a.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/a.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/a1.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/a2.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/addr.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/addr.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/addr.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/addr1.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/addr2.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/ascii.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/bang1.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/bang1.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/bang1.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/bang1.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/bang2.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/c.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/c.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/c.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/c1.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/c2.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/d.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/d.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/d.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/d.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e1.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e1.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e1.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e1.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e2.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e2.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e2.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e2.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e3.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e3.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e3.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e3.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e4.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e4.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/e4.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/f1.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/f2.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g1.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g1.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g1.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g1.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g2.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g2.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g2.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g2.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g3.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g3.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g3.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g3.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g4.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g4.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g4.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g5.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g5.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/g5.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/h.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/i.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/i.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/i.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/i1.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/i2.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/i3.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/j.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/j.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/j.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/k.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/k.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/k.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/k1.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/k2.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/k3.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/k4.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/l.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/l.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/l.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/m.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/m.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/m.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/m.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/n.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/n.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/n.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/nl.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/nl1.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/nl1.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/nl1.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/nl2.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/nl2.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/nl2.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/p.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/p.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/p.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/q.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/q.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/q.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/q1.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/r1.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/r1.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/r1.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/r1.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/r2.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/r2.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/r2.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/r2.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/r3.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/r3.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/r3.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s1.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s1.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s1.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s1.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s10.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s2.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s2.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s2.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s2.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s3.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s3.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s3.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s3.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s4.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s5.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s6.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s7.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s8.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/s9.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/t.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/t.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/t1.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/t1.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/t1.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/t1.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/t2.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/t2.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/t2.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/t2.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/u.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/u.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/u.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/u.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/v.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/v.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/v.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/w.d#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/w.r#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/w.t#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/w1.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/w2.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/w3.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/x.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/test/z.err#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ed/undo.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/expr/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/expr/expr.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/expr/expr.y#1 branch .. //depot/projects/soc2005/sebsd/src/bin/getfacl/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/getfacl/getfacl.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/getfacl/getfacl.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/hostname/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/hostname/hostname.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/hostname/hostname.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/kenv/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/kenv/kenv.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/kenv/kenv.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/kill/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/kill/kill.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/kill/kill.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ln/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ln/ln.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ln/ln.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ln/symlink.7#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ls/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ls/cmp.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ls/extern.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ls/ls.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ls/ls.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ls/ls.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ls/print.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ls/util.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/mkdir/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/mkdir/mkdir.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/mkdir/mkdir.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/mv/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/mv/mv.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/mv/mv.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/ar_io.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/ar_subs.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/buf_subs.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/cache.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/cache.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/cpio.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/cpio.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/cpio.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/extern.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/file_subs.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/ftree.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/ftree.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/gen_subs.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/getoldopt.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/options.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/options.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/pat_rep.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/pat_rep.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/pax.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/pax.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/pax.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/sel_subs.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/sel_subs.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/tables.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/tables.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/tar.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/tar.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/tar.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pax/tty_subs.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ps/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ps/extern.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ps/fmt.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ps/keyword.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ps/nlist.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ps/print.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ps/ps.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ps/ps.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/ps/ps.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pwd/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pwd/pwd.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/pwd/pwd.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/rcp/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/rcp/extern.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/rcp/rcp.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/rcp/rcp.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/rcp/util.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/realpath/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/realpath/realpath.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/realpath/realpath.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/rm/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/rm/rm.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/rm/rm.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/rmail/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/rmdir/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/rmdir/rmdir.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/rmdir/rmdir.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/setfacl/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/setfacl/file.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/setfacl/mask.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/setfacl/merge.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/setfacl/remove.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/setfacl/setfacl.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/setfacl/setfacl.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/setfacl/setfacl.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/setfacl/util.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/TOUR#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/alias.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/alias.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/arith.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/arith.y#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/arith_lex.l#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/bltin/echo.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/bltin/echo.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/builtins.def#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/cd.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/cd.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/error.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/error.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/eval.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/eval.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/exec.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/exec.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/expand.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/expand.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/funcs/cmv#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/funcs/dirs#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/funcs/kill#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/funcs/login#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/funcs/newgrp#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/funcs/popd#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/funcs/pushd#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/funcs/suspend#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/histedit.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/init.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/input.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/input.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/jobs.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/jobs.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/mail.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/mail.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/main.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/main.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/memalloc.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/memalloc.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/miscbltin.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/mkbuiltins#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/mkinit.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/mknodes.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/mksyntax.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/mktokens#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/myhistedit.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/mystring.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/mystring.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/nodes.c.pat#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/nodetypes#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/options.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/options.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/output.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/output.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/parser.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/parser.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/redir.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/redir.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/sh.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/shell.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/show.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/show.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/trap.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/trap.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/var.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sh/var.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sleep/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sleep/sleep.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sleep/sleep.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/stty/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/stty/cchar.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/stty/extern.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/stty/gfmt.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/stty/key.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/stty/modes.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/stty/print.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/stty/stty.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/stty/stty.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/stty/stty.h#1 branch .. //depot/projects/soc2005/sebsd/src/bin/stty/util.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sync/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sync/sync.8#1 branch .. //depot/projects/soc2005/sebsd/src/bin/sync/sync.c#1 branch .. //depot/projects/soc2005/sebsd/src/bin/test/Makefile#1 branch .. //depot/projects/soc2005/sebsd/src/bin/test/TEST.README#1 branch .. //depot/projects/soc2005/sebsd/src/bin/test/TEST.csh#1 branch .. //depot/projects/soc2005/sebsd/src/bin/test/TEST.sh#1 branch .. //depot/projects/soc2005/sebsd/src/bin/test/test.1#1 branch .. //depot/projects/soc2005/sebsd/src/bin/test/test.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/AUTHORS#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/BUGS#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/COPYING#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/ChangeLog#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/INSTALL#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/MIRRORS.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/MIRRORS.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/NEWS#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/README#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/README.ldap#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/README.y2k#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amd.8#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amd.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amd.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/autil.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/clock.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/conf.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/map.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/opts.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/restart.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/sched.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amq/amq.8#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amq/amq.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amq/amq.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/bootstrap#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/doc/version.texi#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/libamu/strerror.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/libamu/util.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/m4/GNUmakefile#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/m4/amdgrep#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/m4/amindent#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/m4/autopat#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/m4/chop-aclocal.pl#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/m4/copy-if-newbig#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/m4/macros/HEADER#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/m4/macros/TRAILER#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/m4/mk-aclocal#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/m4/mkconf#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/m4/rmtspc#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/m4/update_build_version#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/redhat-ctl-amd.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/tasks#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/AUTHORS#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/ChangeLog#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/FAQ#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/INSTALL#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Makefile.am#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Makefile.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/NEWS#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/README#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/array.b#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/atan.b#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/div.b#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/exp.b#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/fact.b#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/jn.b#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/ln.b#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/mul.b#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/raise.b#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/signum#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/sine.b#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/Test/timetest#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/acconfig.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/aclocal.m4#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/bc.y#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/const.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/execute.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/global.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/global.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/load.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/main.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/proto.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/scan.l#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/storage.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/bc/util.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/config.h.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/configure#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/configure.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/dc/array.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/dc/dc.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/dc/dc.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/dc/eval.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/dc/misc.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/dc/stack.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/dc/string.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/doc/bc.1#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/doc/dc.1#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/h/number.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/install-sh#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/lib/number.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/missing#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bc/stamp-h.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/CHANGES#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/COPYRIGHT#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/FAQ#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/FREEBSD-Upgrade#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/FREEBSD-Xlist#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/KNOWN_DEFECTS#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/Makefile.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/README#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/acconfig.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/Makefile.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/check/Makefile.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/check/check-tool.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/check/check-tool.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/check/named-checkconf.8#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/check/named-checkconf.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/check/named-checkconf.docbook#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/check/named-checkconf.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/check/named-checkzone.8#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/check/named-checkzone.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/check/named-checkzone.docbook#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/check/named-checkzone.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dig/Makefile.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dig/dig.1#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dig/dig.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dig/dig.docbook#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dig/dig.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dig/dighost.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dig/host.1#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dig/host.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dig/host.docbook#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dig/host.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dig/include/dig/dig.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dig/nslookup.1#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dig/nslookup.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dig/nslookup.docbook#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dig/nslookup.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/Makefile.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-makekeyset.8#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-makekeyset.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-makekeyset.docbook#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-makekeyset.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-signkey.8#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-signkey.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-signkey.docbook#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-signkey.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssectool.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/dnssec/dnssectool.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/Makefile.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/aclconf.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/builtin.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/client.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/config.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/control.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/controlconf.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/aclconf.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/builtin.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/client.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/config.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/control.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/globals.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/listenlist.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/log.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/logconf.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/lwresd.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/main.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/notify.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/query.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/server.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/sortlist.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/types.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/update.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/xfrout.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/interfacemgr.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/listenlist.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/log.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/logconf.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/lwaddr.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/lwdclient.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/lwderror.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/lwdgabn.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/lwdgnba.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/lwdgrbn.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/lwdnoop.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/lwresd.8#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/lwresd.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/lwresd.docbook#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/lwresd.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/lwsearch.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/main.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/named.8#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/named.conf.5#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/named.conf.docbook#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/named.conf.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/named.docbook#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/named.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/notify.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/query.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/server.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/sortlist.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/tkeyconf.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/tsigconf.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/unix/Makefile.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/unix/include/named/os.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/unix/os.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/update.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/xfrout.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/named/zoneconf.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/nsupdate/Makefile.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/Makefile.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/rndc.8#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/rndc.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/rndc.conf#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/rndc.conf.5#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/rndc.conf.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/rndc.docbook#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/rndc.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/unix/os.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/util.c#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/bin/rndc/util.h#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/config.guess#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/config.sub#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/configure.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/Makefile.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/arm/Bv9ARM.html#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/arm/Makefile.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/arm/README-SGML#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/arm/isc.color.gif#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/arm/nominum-docbook-html.dsl.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/arm/nominum-docbook-print.dsl.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/arm/validate.sh.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-08.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-intro-11.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-protocol-07.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-records-09.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-insensitive-04.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-01.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-33.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-04.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-00.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-02.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-02.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-01.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-02.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-09.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-01.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsop-misbehavior-against-aaaa-00.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-01.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-02.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-ipseckey-rr-09.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/draft/update#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/misc/Makefile.in#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/misc/dnssec#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/misc/format-options.pl#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/misc/ipv6#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/misc/migration#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/misc/migration-4to9#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/misc/options#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/misc/rfc-compliance#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/misc/roadmap#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/misc/sdb#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/index#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1032.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1033.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1034.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1035.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1101.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1122.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1123.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1183.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1348.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1535.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1536.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1537.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1591.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1611.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1612.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1706.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1712.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1750.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1876.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1886.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1982.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1995.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc1996.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2052.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2104.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2119.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2133.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2136.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2137.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2163.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2168.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2181.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2230.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2308.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2317.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2373.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2374.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2375.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2418.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2535.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2536.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2537.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2538.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2539.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2540.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2541.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2553.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2671.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2672.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2673.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2782.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2825.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2826.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2845.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2874.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2915.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2929.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2930.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc2931.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3007.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3008.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3071.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3090.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3110.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3123.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3152.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3197.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3225.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3226.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3258.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3363.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3364.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3425.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3445.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3467.txt#1 branch .. //depot/projects/soc2005/sebsd/src/contrib/bind9/doc/rfc/rfc3490.txt#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 15 12:26:45 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B8D316A420; Fri, 15 Jul 2005 12:26:45 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 36EDC16A41C for ; Fri, 15 Jul 2005 12:26:45 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E18E143D4C for ; Fri, 15 Jul 2005 12:26:44 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6FCQieR087403 for ; Fri, 15 Jul 2005 12:26:44 GMT (envelope-from soc-victor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6FCQi3j087400 for perforce@freebsd.org; Fri, 15 Jul 2005 12:26:44 GMT (envelope-from soc-victor@freebsd.org) Date: Fri, 15 Jul 2005 12:26:44 GMT Message-Id: <200507151226.j6FCQi3j087400@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-victor@freebsd.org using -f From: soc-victor To: Perforce Change Reviews Cc: Subject: PERFORCE change 80254 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2005 12:26:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=80254 Change 80254 by soc-victor@soc-victor_82.76.158.176 on 2005/07/15 12:26:43 Added support for FS stuff into the hrStorageTable implementation. Next (and last) is the VM part of this SNMP table. Affected files ... .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#5 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#5 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c#2 edit Differences ... ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#5 (text+ko) ==== @@ -146,8 +146,8 @@ */ static void hostres_idle_v(void) { - if ( (time(NULL) - hrState_g.hrStorage_tbl_age) > 7 ) { - HR_DPRINTF((stderr, " %s: need refresh\n ",__func__)); + if ( (time(NULL) - hrState_g.hrStorage_tbl_age) > HR_STORAGE_TBL_REFRESH ) { + HR_DPRINTF((stderr, "%s: hrStorageTable needd refresh\n ",__func__)); refresh_hrStorage_tbl_v(); } ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#5 (text+ko) ==== @@ -40,7 +40,11 @@ #include /*for struct timeval*/ #include /*for SLIST, TAILQ & friends*/ +#include /*for getfsstat*/ +#include /*for getfsstat*/ +#include /*for getfsstat*/ + /*a debug macro*/ #ifndef NDEBUG #define HR_DPRINTF(ARGS) do { \ @@ -66,6 +70,10 @@ struct kvm_swap *swap_devs; /*for kvm_getswapinfo*/ size_t swap_devs_len; /*idem */ + + struct statfs *fs_buf; /*for getfsstat*/ + size_t fs_buf_count; /*idem*/ + uint32_t next_hrStorage_index; /*next int availabe for indexing the hrStorageTable*/ time_t hrStorage_tbl_age; @@ -126,10 +134,11 @@ /* * Finalization routine for hrStorageTable. - * It destroys the lists and frees the heap memory + * It destroys the lists and frees any allocated heap memory */ void fini_hrStorage_tbl_v(void); +#define HR_STORAGE_TBL_REFRESH 7 /* * Refresh routine for hrStorageTable. * Usable for polling the system for any changes. ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c#2 (text+ko) ==== @@ -48,6 +48,7 @@ static void hrStorage_get_vm_v(void){ + /*FIX ME*/ HR_DPRINTF((stderr, "WARNING: hrStorageTable vm not implmeneted yet.\n ")); } @@ -74,8 +75,10 @@ if (map == NULL) { /* new object - get a new index */ - if (hrState_g.next_hrStorage_index > UINT_MAX) + if (hrState_g.next_hrStorage_index > INT_MAX) { + syslog(LOG_ERR, "%s: hrStorageTable index wrap", __func__ ); errx(1, "hrStorage index wrap"); + } if ((map = malloc(sizeof(*map))) == NULL) { syslog(LOG_ERR, "%s: %m", __func__ ); @@ -142,7 +145,7 @@ void hrStorage_get_swap_v(void) { int nswapdev = 0; int len = sizeof(nswapdev); - struct hrStorageTblEntry *entry, *entry_tmp; + struct hrStorageTblEntry *entry; char swap_w_prefix[255+1]; if ( sysctlbyname("vm.nswapdev", &nswapdev,&len, NULL,0 ) < 0 ) { @@ -164,6 +167,7 @@ assert( hrState_g.swap_devs != NULL ); if ( hrState_g.swap_devs == NULL ) { + hrState_g.swap_devs_len = 0; return; } } @@ -176,9 +180,6 @@ return; } - /*mark each entry as missisng*/ - TAILQ_FOREACH(entry, &storage_tbl, link) - entry->flags &= ~HR_STORAGE_FOUND; for(len = 0; len < nswapdev; len++ ) { @@ -205,29 +206,162 @@ }/*end for*/ - /* - * Purge swap items that disappeared - */ - entry = TAILQ_FIRST(&storage_tbl); - while (entry != NULL) { - entry_tmp = TAILQ_NEXT(entry, link); - if (!(entry->flags & HR_STORAGE_FOUND)) - hrStorageTblEntry_delete_v(entry); - entry = entry_tmp; + + +} + +/* + * Very silly detection for FS storage types. + * Should be changed to use devinfo API. + * FIX ME + */ +static +void hrStrorage_getType_v(const struct statfs *fs_p, struct asn_oid *out_type_p) { + assert(fs_p != NULL); + assert(out_type_p != NULL); + if( !(fs_p->f_flags & MNT_LOCAL) ) { + *out_type_p = (struct asn_oid)OIDX_hrStorageNetworkDisk; + return; + } + + if( strncmp (fs_p->f_fstypename, "procfs", MFSNAMELEN ) == 0 || + strncmp (fs_p->f_fstypename, "devfs", MFSNAMELEN ) == 0 ) { + *out_type_p = (struct asn_oid)OIDX_hrStorageOther; + return; + + } + if( strncmp (fs_p->f_mntfromname, "/dev/fd", strlen("/dev/fd") ) == 0 || + strncmp (fs_p->f_mntfromname, "/dev/afd", strlen("/dev/afd") ) == 0) { + *out_type_p = (struct asn_oid)OIDX_hrStorageFloppyDisk; + return; + } + + if( strncmp (fs_p->f_mntfromname, "/dev/acd", strlen("/dev/acd") ) == 0 || + strncmp (fs_p->f_mntfromname, "/dev/cd", strlen("/dev/cd") ) == 0) { + *out_type_p = (struct asn_oid)OIDX_hrStorageCompactDisc; + return; + } + + + if( strncmp (fs_p->f_mntfromname, "/dev/ad", strlen("/dev/ad") ) == 0 || + strncmp (fs_p->f_mntfromname, "/dev/ar", strlen("/dev/ar") ) == 0 || + strncmp (fs_p->f_mntfromname, "/dev/da", strlen("/dev/da") ) == 0 ) { + *out_type_p = (struct asn_oid)OIDX_hrStorageFixedDisk; + return; } + + *out_type_p = (struct asn_oid)OIDX_hrStorageOther; /*not known*/ + return; } +static +void hrStorage_get_fs_v(void) { + int mounted_fs_count = 0; + int i = 0; + struct hrStorageTblEntry *entry; + char fs_string[255+1]; + uint64_t used_blocks_count = 0; + + if( (mounted_fs_count = getfsstat(NULL, 0, MNT_NOWAIT)) < 0 ) { + syslog(LOG_ERR, "getfsstat(NULL, 0, MNT_NOWAIT) failed: %m\n"); + return; /*out of luck this time*/ + } + + if( mounted_fs_count != (int)hrState_g.fs_buf_count || hrState_g.fs_buf == NULL ) { + hrState_g.fs_buf_count = mounted_fs_count; + hrState_g.fs_buf = (struct statfs *)reallocf(hrState_g.fs_buf, + hrState_g.fs_buf_count * sizeof(struct statfs)); + if(hrState_g.fs_buf == NULL) { + hrState_g.fs_buf_count = 0; + assert(0); + return; + } + } + + if( (mounted_fs_count = getfsstat(hrState_g.fs_buf, + hrState_g.fs_buf_count * sizeof(struct statfs), + MNT_NOWAIT)) < 0 ) { + syslog(LOG_ERR, "getfsstat(, , MNT_NOWAIT) failed: %m \n"); + return; /*out of luck this time*/ + } + + HR_DPRINTF((stderr, "%s: Got %d mounted FS\n ", __func__, mounted_fs_count)); + for(i = 0; i < mounted_fs_count; i++ ) { + + memset(&fs_string[0], '\0', sizeof(fs_string) ); + snprintf(fs_string, 255, "%s, type: %s, dev: %s", hrState_g.fs_buf[i].f_mntonname, + hrState_g.fs_buf[i].f_fstypename, + hrState_g.fs_buf[i].f_mntfromname); + + entry = hrStorageTblEntry_find_by_name(fs_string); + if(entry != NULL) { + entry->flags |= HR_STORAGE_FOUND; + + hrStrorage_getType_v( &hrState_g.fs_buf[i], &entry->type); + + entry->allocationUnits = ( hrState_g.fs_buf[i].f_bsize > (uint64_t)INT_MAX ? + INT_MAX : + (int32_t)hrState_g.fs_buf[i].f_bsize ); /*may overflow the SNMP type*/ + + entry->size = ( hrState_g.fs_buf[i].f_blocks > (uint64_t)INT_MAX ? + INT_MAX : + (int32_t)hrState_g.fs_buf[i].f_blocks ); /*may overflow the SNMP type*/ + + used_blocks_count = hrState_g.fs_buf[i].f_blocks - hrState_g.fs_buf[i].f_bfree; + + entry->used = ( used_blocks_count > (uint64_t)INT_MAX ? + INT_MAX : + used_blocks_count ); /*may overflow the SNMP type*/ + + entry->allocationFailures = 0; + continue; + } + if ((entry = hrStorageTblEntry_create(fs_string)) != NULL) { + entry->flags |= HR_STORAGE_FOUND; + + hrStrorage_getType_v( &hrState_g.fs_buf[i], &entry->type); + + entry->allocationUnits = ( hrState_g.fs_buf[i].f_bsize > (uint64_t)INT_MAX ? + INT_MAX : + (int32_t)hrState_g.fs_buf[i].f_bsize ); /*may overflow the SNMP type*/ + + entry->size = ( hrState_g.fs_buf[i].f_blocks > (uint64_t)INT_MAX ? + INT_MAX : + (int32_t)hrState_g.fs_buf[i].f_blocks ); /*may overflow the SNMP type*/ + + used_blocks_count = hrState_g.fs_buf[i].f_blocks - hrState_g.fs_buf[i].f_bfree; + + entry->used = ( used_blocks_count > (uint64_t)INT_MAX ? + INT_MAX : + used_blocks_count ); /*may overflow the SNMP type*/ + + entry->allocationFailures = 0; + + } + + }/*end for*/ + + +} + void init_hrStorage_tbl_v(void) { hrState_g.swap_devs = NULL; hrState_g.swap_devs_len = 0; + + hrState_g.fs_buf = NULL; + hrState_g.fs_buf_count = 0; + + hrState_g.next_hrStorage_index = 1; hrStorage_get_vm_v(); hrStorage_get_swap_v(); + hrStorage_get_fs_v(); + } void fini_hrStorage_tbl_v(void) { @@ -237,9 +371,15 @@ free( hrState_g.swap_devs ); hrState_g.swap_devs = NULL; } - hrState_g.swap_devs_len = 0; - + + if ( hrState_g.fs_buf != NULL ) { + free( hrState_g.fs_buf ); + hrState_g.fs_buf = NULL; + } + hrState_g.fs_buf_count = 0; + + n1 = STAILQ_FIRST(&storage_name_map); while (n1 != NULL) { n2 = STAILQ_NEXT(n1, link); @@ -259,21 +399,40 @@ void refresh_hrStorage_tbl_v(void) { + + struct hrStorageTblEntry *entry = NULL, *entry_tmp = NULL; + if ( this_tick <= hrState_g.hr_tick) { - HR_DPRINTF((stderr, " %s: no refresh needed\n ",__func__)); + HR_DPRINTF((stderr, "%s: no refresh needed\n ",__func__)); return; } + /*mark each entry as missisng*/ + TAILQ_FOREACH(entry, &storage_tbl, link) + entry->flags &= ~HR_STORAGE_FOUND; hrStorage_get_vm_v(); hrStorage_get_swap_v(); + hrStorage_get_fs_v(); + + /* + * Purge items items that disappeared + */ + entry = TAILQ_FIRST(&storage_tbl); + while (entry != NULL) { + entry_tmp = TAILQ_NEXT(entry, link); + if (!(entry->flags & HR_STORAGE_FOUND)) + hrStorageTblEntry_delete_v(entry); + entry = entry_tmp; + } + hrState_g.hr_tick = this_tick; hrState_g.hrStorage_tbl_age = time(NULL); - HR_DPRINTF((stderr, " %s: refresh DONE\n ",__func__)); + HR_DPRINTF((stderr, "%s: refresh DONE\n ",__func__)); } int op_hrStorageTable(struct snmp_context *ctx __unused, @@ -290,7 +449,7 @@ refresh entries here?! */ if ( (time(NULL) - hrState_g.hrStorage_tbl_age) > 7 ) { - HR_DPRINTF((stderr, " %s: need refresh\n ",__func__)); + HR_DPRINTF((stderr, "%s: need refresh\n ",__func__)); refresh_hrStorage_tbl_v(); } From owner-p4-projects@FreeBSD.ORG Fri Jul 15 12:44:07 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 316BD16A420; Fri, 15 Jul 2005 12:44:07 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0BFE616A41C for ; Fri, 15 Jul 2005 12:44:07 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF5CF43D45 for ; Fri, 15 Jul 2005 12:44:06 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6FCi6EC088265 for ; Fri, 15 Jul 2005 12:44:06 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6FCi6p0088262 for perforce@freebsd.org; Fri, 15 Jul 2005 12:44:06 GMT (envelope-from jhb@freebsd.org) Date: Fri, 15 Jul 2005 12:44:06 GMT Message-Id: <200507151244.j6FCi6p0088262@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 80256 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2005 12:44:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=80256 Change 80256 by jhb@jhb_slimer on 2005/07/15 12:43:46 Catch up to atomic_foo_ptr() changes. Affected files ... .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#5 edit Differences ... ==== //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#5 (text+ko) ==== @@ -771,7 +771,7 @@ LIST_INSERT_HEAD(&pm->pm_targets, pt, pt_next); - atomic_store_rel_ptr(&pp->pp_pmcs[ri].pp_pmc, pm); + atomic_store_rel_ptr((uintptr_t *)&pp->pp_pmcs[ri].pp_pmc, pm); if (pm->pm_owner->po_owner == pp->pp_proc) pm->pm_flags |= PMC_F_ATTACHED_TO_OWNER; From owner-p4-projects@FreeBSD.ORG Fri Jul 15 12:53:19 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11FA716A420; Fri, 15 Jul 2005 12:53:19 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C1AFA16A41F for ; Fri, 15 Jul 2005 12:53:18 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8239A43D46 for ; Fri, 15 Jul 2005 12:53:18 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6FCrIL7095757 for ; Fri, 15 Jul 2005 12:53:18 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6FCrIkb095754 for perforce@freebsd.org; Fri, 15 Jul 2005 12:53:18 GMT (envelope-from jhb@freebsd.org) Date: Fri, 15 Jul 2005 12:53:18 GMT Message-Id: <200507151253.j6FCrIkb095754@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 80257 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2005 12:53:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=80257 Change 80257 by jhb@jhb_blue on 2005/07/15 12:52:59 Really fix. Affected files ... .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#6 edit Differences ... ==== //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#6 (text+ko) ==== @@ -771,7 +771,8 @@ LIST_INSERT_HEAD(&pm->pm_targets, pt, pt_next); - atomic_store_rel_ptr((uintptr_t *)&pp->pp_pmcs[ri].pp_pmc, pm); + atomic_store_rel_ptr((uintptr_t *)&pp->pp_pmcs[ri].pp_pmc, + (uintptr_t)pm); if (pm->pm_owner->po_owner == pp->pp_proc) pm->pm_flags |= PMC_F_ATTACHED_TO_OWNER; From owner-p4-projects@FreeBSD.ORG Fri Jul 15 13:42:20 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7010716A420; Fri, 15 Jul 2005 13:42:19 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4A77F16A41C for ; Fri, 15 Jul 2005 13:42:19 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0531543D46 for ; Fri, 15 Jul 2005 13:42:19 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6FDgId4097601 for ; Fri, 15 Jul 2005 13:42:18 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6FDgIlA097598 for perforce@freebsd.org; Fri, 15 Jul 2005 13:42:18 GMT (envelope-from soc-bushman@freebsd.org) Date: Fri, 15 Jul 2005 13:42:18 GMT Message-Id: <200507151342.j6FDgIlA097598@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 80260 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2005 13:42:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=80260 Change 80260 by soc-bushman@soc-bushman_stinger on 2005/07/15 13:42:14 rpc finished - patch and testing Affected files ... .. //depot/projects/soc2005/nsswitch_cached/src/include/rpc/rpcent.h#2 edit .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/getrpcent.c#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/getrpcent_test/Makefile#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/getrpcent_test/getrpcent.c#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/getrpcent_test/getrpcent.h#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/getrpcent_test/getrpcent_test.c#2 edit Differences ... ==== //depot/projects/soc2005/nsswitch_cached/src/include/rpc/rpcent.h#2 (text+ko) ==== @@ -53,12 +53,13 @@ }; __BEGIN_DECLS -extern struct rpcent *getrpcbyname_r(const char *, struct rpcent *, - char *, int); -extern struct rpcent *getrpcbynumber_r(int, struct rpcent *, char *, int); -extern struct rpcent *getrpcent_r(struct rpcent *, char *, int); - -/* Old interfaces that return a pointer to a static area; MT-unsafe */ +extern int getrpcbyname_r(const char *, struct rpcent *, char *, size_t, + struct rpcent **); +extern int getrpcbynumber_r(int, struct rpcent *, char *, size_t, + struct rpcent **); +extern int getrpcent_r(struct rpcent *, char *, size_t, struct rpcent **); + +/* These interfaces are currently implemented through nsswitch and MT-safe */ extern struct rpcent *getrpcbyname(char *); extern struct rpcent *getrpcbynumber(int); extern struct rpcent *getrpcent(void); ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/getrpcent.c#2 (text+ko) ==== @@ -40,281 +40,740 @@ * Copyright (c) 1984 by Sun Microsystems, Inc. */ -#include "namespace.h" +#include "getrpcent.h" + +#include #include - -#include +#include #include - #include -#include +#include +#include +#include #include +#include +#include #include -#include - #include #ifdef YP #include #include #endif +#include +#include "namespace.h" +#include "reentrant.h" #include "un-namespace.h" #include "libc_private.h" +#include "nss_tls.h" + +#define RPCDB "/etc/rpc" + +/* nsswitch declarations */ +enum constants +{ + SETRPCENT = 1, + ENDRPCENT = 2, + RPCENT_STORAGE_INITIAL = 1 << 10, /* 1 KByte */ + RPCENT_STORAGE_MAX = 1 << 20, /* 1 MByte */ +}; + +static const ns_src defaultsrc[] = { + { NSSRC_FILES, NS_SUCCESS }, +#ifdef YP + { NSSRC_NIS, NS_SUCCESS }, +#endif + { NULL, 0 } +}; -/* - * Internet version. - */ -static struct rpcdata { - FILE *rpcf; +/* files backend declarations */ +struct files_state { + FILE *fp; int stayopen; -#define MAXALIASES 35 - char *rpc_aliases[MAXALIASES]; - struct rpcent rpc; - char line[BUFSIZ+1]; -#ifdef YP - char *domain; +}; + +static int files_rpcent(void *, void *, va_list); +static int files_setrpcent(void *, void *, va_list); + +static void files_endstate(void *); +NSS_TLS_HANDLING(files); + +/* nis backend declarations */ +#ifdef YP +struct nis_state { + char domain[MAXHOSTNAMELEN]; char *current; int currentlen; + int stepping; + int no_name_map; +}; + +static int nis_rpcent(void *, void *, va_list); +static int nis_setrpcent(void *, void *, va_list); + +static void nis_endstate(void *); +NSS_TLS_HANDLING(nis); #endif -} *rpcdata; -static struct rpcent *interpret(char *val, size_t len); +/* get** wrappers for get**_r functions declarations */ +struct rpcent_state { + struct rpcent rpc; + char *buffer; + size_t bufsize; +}; +static void rpcent_endstate(void *); +NSS_TLS_HANDLING(rpcent); -#ifdef YP -static int __yp_nomap = 0; -#endif /* YP */ +union key { + const char *name; + int number; +}; -#define RPCDB "/etc/rpc" +static int wrap_getrpcbyname_r(union key, struct rpcent *, char *, + size_t, struct rpcent **); +static int wrap_getrpcbynumber_r(union key, struct rpcent *, char *, + size_t, struct rpcent **); +static int wrap_getrpcent_r(union key, struct rpcent *, char *, + size_t, struct rpcent **); +static struct rpcent *getrpc(int (*fn)(union key, struct rpcent *, char *, + size_t, struct rpcent **), union key); -static struct rpcdata *_rpcdata(void); +static int +rpcent_unpack(char *p, struct rpcent *rpc, char **r_aliases, + size_t aliases_size, int *errnop) +{ + char *cp, **q; -static struct rpcdata * -_rpcdata() -{ - struct rpcdata *d = rpcdata; + assert(p != NULL); - if (d == 0) { - d = (struct rpcdata *)calloc(1, sizeof (struct rpcdata)); - rpcdata = d; + if (*p == '#') + return (-1); + cp = strpbrk(p, "#\n"); + if (cp == NULL) + return (-1); + *cp = '\0'; + cp = strpbrk(p, " \t"); + if (cp == NULL) + return (-1); + *cp++ = '\0'; + /* THIS STUFF IS INTERNET SPECIFIC */ + rpc->r_name = p; + while (*cp == ' ' || *cp == '\t') + cp++; + rpc->r_number = atoi(cp); + q = rpc->r_aliases = r_aliases; + cp = strpbrk(cp, " \t"); + if (cp != NULL) + *cp++ = '\0'; + while (cp && *cp) { + if (*cp == ' ' || *cp == '\t') { + cp++; + continue; + } + if (q < &(r_aliases[aliases_size - 1])) + *q++ = cp; + else { + *errnop = ERANGE; + return -1; + } + + cp = strpbrk(cp, " \t"); + if (cp != NULL) + *cp++ = '\0'; } - return (d); + *q = NULL; + return 0; +} + +/* files backend implementation */ +static void +files_endstate(void *p) +{ + FILE * f; + + if (p == NULL) + return; + + f = ((struct files_state *)p)->fp; + if (f != NULL) + fclose(f); + + free(p); } -struct rpcent * -getrpcbynumber(number) - int number; +static int +files_rpcent(void *retval, void *mdata, va_list ap) { -#ifdef YP - int reason; - char adrstr[16]; -#endif - struct rpcent *p; - struct rpcdata *d = _rpcdata(); + char *name; + int number; + struct rpcent *rpc; + char *buffer; + size_t bufsize; + int *errnop; + + char *line; + size_t linesize; + char **aliases; + int aliases_size; + char **rp; + + struct files_state *st; + int rv; + int stayopen; + enum nss_lookup_type how; + + how = (enum nss_lookup_type)mdata; + switch (how) + { + case nss_lt_name: + name = va_arg(ap, char *); + break; + case nss_lt_id: + number = va_arg(ap, int); + break; + case nss_lt_all: + break; + default: + return (NS_NOTFOUND); + } + + rpc = va_arg(ap, struct rpcent *); + buffer = va_arg(ap, char *); + bufsize = va_arg(ap, size_t); + errnop = va_arg(ap, int *); + + *errnop = files_getstate(&st); + if (*errnop != 0) + return (NS_UNAVAIL); + + if (st->fp == NULL && (st->fp = fopen(RPCDB, "r")) == NULL) { + *errnop = errno; + return (NS_UNAVAIL); + } + + if (how == nss_lt_all) + stayopen = 1; + else { + rewind(st->fp); + stayopen = st->stayopen; + } + + do { + if ((line = fgetln(st->fp, &linesize)) == NULL) { + *errnop = errno; + rv = NS_RETURN; + break; + } + + if (bufsize <= linesize + _ALIGNBYTES + sizeof(char *)) { + *errnop = ERANGE; + rv = NS_RETURN; + break; + } - if (d == 0) - return (0); -#ifdef YP - if (!__yp_nomap && _yp_check(&d->domain)) { - sprintf(adrstr, "%d", number); - reason = yp_match(d->domain, "rpc.bynumber", adrstr, strlen(adrstr), - &d->current, &d->currentlen); - switch(reason) { - case 0: - break; - case YPERR_MAP: - __yp_nomap = 1; - goto no_yp; - break; - default: - return(0); - break; - } - d->current[d->currentlen] = '\0'; - p = interpret(d->current, d->currentlen); - (void) free(d->current); - return p; - } -no_yp: -#endif /* YP */ + aliases = (char **)_ALIGN(&buffer[linesize+1]); + aliases_size = (buffer + bufsize - (char *)aliases)/sizeof(char *); + if (aliases_size < 1) { + *errnop = ERANGE; + rv = NS_RETURN; + break; + } + + memcpy(buffer, line, linesize); + buffer[linesize] = '\0'; - setrpcent(0); - while ((p = getrpcent()) != NULL) { - if (p->r_number == number) + rv = rpcent_unpack(buffer, rpc, aliases, aliases_size, errnop); + if (rv != 0) { + if (*errnop == 0) { + rv = NS_NOTFOUND; + continue; + } + else { + rv = NS_RETURN; + break; + } + } + + switch (how) + { + case nss_lt_name: + if (strcmp(rpc->r_name, name) == 0) + goto done; + for (rp = rpc->r_aliases; *rp != NULL; rp++) { + if (strcmp(*rp, name) == 0) + goto done; + } + rv = NS_NOTFOUND; + continue; +done: + rv = NS_SUCCESS; + break; + case nss_lt_id: + rv = (rpc->r_number == number) ? NS_SUCCESS : NS_NOTFOUND; + break; + case nss_lt_all: + rv = NS_SUCCESS; break; + } + + } while (!(rv & NS_TERMINATE)); + + if (!stayopen && st->fp!=NULL) { + fclose(st->fp); + st->fp = NULL; } - endrpcent(); - return (p); + + if ((rv == NS_SUCCESS) && (retval != NULL)) + *((struct rpcent **)retval) = rpc; + + return (rv); +} + +static int +files_setrpcent(void *retval, void *mdata, va_list ap) +{ + struct files_state *st; + int rv; + int f; + + rv = files_getstate(&st); + if (rv != 0) + return (NS_UNAVAIL); + + switch ((enum constants)mdata) + { + case SETRPCENT: + f = va_arg(ap,int); + if (st->fp == NULL) + st->fp = fopen(RPCDB, "r"); + else + rewind(st->fp); + st->stayopen |= f; + break; + case ENDRPCENT: + if (st->fp != NULL) { + fclose(st->fp); + st->fp = NULL; + } + st->stayopen = 0; + break; + default: + break; + } + + return (NS_UNAVAIL); } -struct rpcent * -getrpcbyname(name) - char *name; +/* nis backend implementation */ +#ifdef YP +static void +nis_endstate(void *p) { - struct rpcent *rpc = NULL; - char **rp; + if (p == NULL) + return; - assert(name != NULL); + free(((struct nis_state *)p)->current); + free(p); +} - setrpcent(0); - while ((rpc = getrpcent()) != NULL) { - if (strcmp(rpc->r_name, name) == 0) - goto done; - for (rp = rpc->r_aliases; *rp != NULL; rp++) { - if (strcmp(*rp, name) == 0) - goto done; +static int +nis_rpcent(void *retval, void *mdata, va_list ap) +{ + char *name; + int number; + struct rpcent *rpc; + char *buffer; + size_t bufsize; + int *errnop; + + char **rp; + char **aliases; + int aliases_size; + + char *lastkey; + char *resultbuf; + int resultbuflen; + char buf[YPMAXRECORD + 2]; + + struct nis_state *st; + int rv; + enum nss_lookup_type how; + int no_name_active; + + how = (enum nss_lookup_type)mdata; + switch (how) + { + case nss_lt_name: + name = va_arg(ap, char *); + break; + case nss_lt_id: + number = va_arg(ap, int); + break; + case nss_lt_all: + break; + default: + return (NS_NOTFOUND); + } + + rpc = va_arg(ap, struct rpcent *); + buffer = va_arg(ap, char *); + bufsize = va_arg(ap, size_t); + errnop = va_arg(ap, int *); + + *errnop = nis_getstate(&st); + if (*errnop != 0) + return (NS_UNAVAIL); + + if (st->domain[0] == '\0') { + if (getdomainname(st->domain, sizeof(st->domain)) != 0) { + *errnop = errno; + return (NS_UNAVAIL); } } + + no_name_active = 0; + do { + switch (how) + { + case nss_lt_name: + if (!st->no_name_map) + { + snprintf(buf, sizeof buf, "%s", name); + rv = yp_match(st->domain, "rpc.byname", buf, strlen(buf), + &resultbuf, &resultbuflen); + + switch (rv) { + case 0: + break; + case YPERR_MAP: + st->stepping = 0; + no_name_active = 1; + how = nss_lt_all; + + rv = NS_NOTFOUND; + continue; + default: + rv = NS_NOTFOUND; + goto fin; + } + } else { + st->stepping = 0; + no_name_active = 1; + how = nss_lt_all; + + rv = NS_NOTFOUND; + continue; + } + break; + case nss_lt_id: + snprintf(buf, sizeof buf, "%d", number); + if (yp_match(st->domain, "rpc.bynumber", buf, strlen(buf), + &resultbuf, &resultbuflen)) { + rv = NS_NOTFOUND; + goto fin; + } + break; + case nss_lt_all: + if (!st->stepping) { + rv = yp_first(st->domain, "rpc.bynumber", &st->current, + &st->currentlen, &resultbuf, &resultbuflen); + if (rv) { + rv = NS_NOTFOUND; + goto fin; + } + st->stepping = 1; + } else { + lastkey = st->current; + rv = yp_next(st->domain, "rpc.bynumber", st->current, + st->currentlen, &st->current, &st->currentlen, &resultbuf, + &resultbuflen); + free(lastkey); + if (rv) { + st->stepping = 0; + rv = NS_NOTFOUND; + goto fin; + } + } + break; + } + + /* we need a room for additional \n symbol */ + if (bufsize <= resultbuflen +1 + _ALIGNBYTES + sizeof(char *)) { + *errnop = ERANGE; + rv = NS_RETURN; + break; + } + + aliases=(char **)_ALIGN(&buffer[resultbuflen+2]); + aliases_size = (buffer + bufsize - (char *)aliases)/sizeof(char *); + if (aliases_size < 1) { + *errnop = ERANGE; + rv = NS_RETURN; + break; + } + + /* rpcent_unpack expects lines terminated with \n -- make it happy */ + memcpy(buffer, resultbuf, resultbuflen); + buffer[resultbuflen] = '\n'; + buffer[resultbuflen+1] = '\0'; + free(resultbuf); + + if (rpcent_unpack(buffer, rpc, aliases, aliases_size, errnop) != 0) { + if (*errnop == 0) + rv = NS_NOTFOUND; + else + rv = NS_RETURN; + } else { + if ((how == nss_lt_all) && (no_name_active != 0)) { + if (strcmp(rpc->r_name, name) == 0) + goto done; + for (rp = rpc->r_aliases; *rp != NULL; rp++) { + if (strcmp(*rp, name) == 0) + goto done; + } + rv = NS_NOTFOUND; + continue; done: - endrpcent(); - return (rpc); + rv = NS_SUCCESS; + } else + rv = NS_SUCCESS; + } + + } while (!(rv & NS_TERMINATE) && (how == nss_lt_all)); + +fin: + if ((rv == NS_SUCCESS) && (retval != NULL)) + *((struct rpcent **)retval) = rpc; + + return (rv); +} + +static int +nis_setrpcent(void *retval, void *mdata, va_list ap) +{ + struct nis_state *st; + int rv; + + rv = nis_getstate(&st); + if (rv != 0) + return (NS_UNAVAIL); + + switch ((enum constants)mdata) + { + case SETRPCENT: + case ENDRPCENT: + free(st->current); + st->current = NULL; + st->stepping = 0; + break; + default: + break; + } + + return (NS_UNAVAIL); +} +#endif + +/* get**_r functions implementation */ +int +getrpcbyname_r(const char *name, struct rpcent *rpc, char *buffer, + size_t bufsize, struct rpcent **result) +{ + static const ns_dtab dtab[] = { + { NSSRC_FILES, files_rpcent, (void *)nss_lt_name }, +#ifdef YP + { NSSRC_NIS, nis_rpcent, (void *)nss_lt_name }, +#endif + { NULL, NULL, NULL } + }; + + int rv, ret_errno; + + ret_errno = 0; + *result = NULL; + rv = nsdispatch(result, dtab, NSDB_RPC, "getrpcbyname_r", defaultsrc, + name, rpc, buffer, bufsize, &ret_errno); + + if (rv == NS_SUCCESS) + return (0); + else + return (ret_errno); +} + +int +getrpcbynumber_r(int number, struct rpcent *rpc, char *buffer, + size_t bufsize, struct rpcent **result) +{ + static const ns_dtab dtab[] = { + { NSSRC_FILES, files_rpcent, (void *)nss_lt_id }, +#ifdef YP + { NSSRC_NIS, nis_rpcent, (void *)nss_lt_id }, +#endif + { NULL, NULL, NULL } + }; + int rv, ret_errno; + + ret_errno = 0; + *result = NULL; + rv = nsdispatch(result, dtab, NSDB_RPC, "getrpcbynumber_r", defaultsrc, + number, rpc, buffer, bufsize, &ret_errno); + + if (rv == NS_SUCCESS) + return (0); + else + return (ret_errno); } -void -setrpcent(f) - int f; +int +getrpcent_r(struct rpcent *rpc, char *buffer, size_t bufsize, + struct rpcent **result) { - struct rpcdata *d = _rpcdata(); + static const ns_dtab dtab[] = { + { NSSRC_FILES, files_rpcent, (void *)nss_lt_all }, +#ifdef YP + { NSSRC_NIS, nis_rpcent, (void *)nss_lt_all }, +#endif + { NULL, NULL, NULL } + }; + int rv, ret_errno; + + ret_errno = 0; + *result = NULL; + rv = nsdispatch(result, dtab, NSDB_RPC, "getrpcent_r", defaultsrc, + rpc, buffer, bufsize, &ret_errno); - if (d == 0) - return; -#ifdef YP - if (!__yp_nomap && _yp_check(NULL)) { - if (d->current) - free(d->current); - d->current = NULL; - d->currentlen = 0; - return; - } - __yp_nomap = 0; -#endif /* YP */ - if (d->rpcf == NULL) - d->rpcf = fopen(RPCDB, "r"); + if (rv == NS_SUCCESS) + return (0); else - rewind(d->rpcf); - d->stayopen |= f; + return (ret_errno); +} + +void +setrpcent(int stayopen) +{ + static const ns_dtab dtab[] = { + { NSSRC_FILES, files_setrpcent, (void *)SETRPCENT }, +#ifdef YP + { NSSRC_NIS, nis_setrpcent, (void *)SETRPCENT }, +#endif + { NULL, NULL, NULL } + }; + + (void)nsdispatch(NULL, dtab, NSDB_RPC, "setrpcent", defaultsrc, stayopen); } -void +void endrpcent() { - struct rpcdata *d = _rpcdata(); + static const ns_dtab dtab[] = { + { NSSRC_FILES, files_setrpcent, (void *)ENDRPCENT }, +#ifdef YP + { NSSRC_NIS, nis_setrpcent, (void *)ENDRPCENT }, +#endif + { NULL, NULL, NULL } + }; + + (void)nsdispatch(NULL, dtab, NSDB_SERVICES, "endrpcent", defaultsrc); +} - if (d == 0) +/* get** wrappers for get**_r functions implementation */ +static void +rpcent_endstate(void *p) +{ + if (p == NULL) return; -#ifdef YP - if (!__yp_nomap && _yp_check(NULL)) { - if (d->current && !d->stayopen) - free(d->current); - d->current = NULL; - d->currentlen = 0; - return; - } - __yp_nomap = 0; -#endif /* YP */ - if (d->rpcf && !d->stayopen) { - fclose(d->rpcf); - d->rpcf = NULL; - } + + free(((struct rpcent_state *)p)->buffer); + free(p); +} + +static int +wrap_getrpcbyname_r(union key key, struct rpcent *rpc, char *buffer, size_t bufsize, + struct rpcent **res) +{ + return (getrpcbyname_r(key.name, rpc, buffer, bufsize, res)); } -struct rpcent * -getrpcent() +static int +wrap_getrpcbynumber_r(union key key, struct rpcent *rpc, char *buffer, size_t bufsize, + struct rpcent **res) { - struct rpcdata *d = _rpcdata(); -#ifdef YP - struct rpcent *hp; - int reason; - char *val = NULL; - int vallen; -#endif + return (getrpcbynumber_r(key.number, rpc, buffer, bufsize, res)); +} - if (d == 0) - return(NULL); -#ifdef YP - if (!__yp_nomap && _yp_check(&d->domain)) { - if (d->current == NULL && d->currentlen == 0) { - reason = yp_first(d->domain, "rpc.bynumber", - &d->current, &d->currentlen, - &val, &vallen); - } else { - reason = yp_next(d->domain, "rpc.bynumber", - d->current, d->currentlen, - &d->current, &d->currentlen, - &val, &vallen); - } - switch(reason) { - case 0: - break; - case YPERR_MAP: - __yp_nomap = 1; - goto no_yp; - break; - default: - return(0); - break; - } - val[vallen] = '\0'; - hp = interpret(val, vallen); - (void) free(val); - return hp; - } -no_yp: -#endif /* YP */ - if (d->rpcf == NULL && (d->rpcf = fopen(RPCDB, "r")) == NULL) - return (NULL); - /* -1 so there is room to append a \n below */ - if (fgets(d->line, BUFSIZ - 1, d->rpcf) == NULL) - return (NULL); - return (interpret(d->line, strlen(d->line))); +static int +wrap_getrpcent_r(union key key __unused, struct rpcent *rpc, char *buffer, size_t bufsize, + struct rpcent **res) +{ + return (getrpcent_r(rpc, buffer, bufsize, res)); } static struct rpcent * -interpret(val, len) - char *val; - size_t len; +getrpc(int (*fn)(union key, struct rpcent *, char *, size_t, struct rpcent **), + union key key) +{ + int rv; + struct rpcent *res; + struct rpcent_state * st; + + rv=rpcent_getstate(&st); + if (rv != 0) { + errno = rv; + return NULL; + } + + if (st->buffer == NULL) { + st->buffer = malloc(RPCENT_STORAGE_INITIAL); + if (st->buffer == NULL) + return (NULL); + st->bufsize = RPCENT_STORAGE_INITIAL; + } + do { + rv = fn(key, &st->rpc, st->buffer, st->bufsize, &res); + if (res == NULL && rv == ERANGE) { + free(st->buffer); + if ((st->bufsize << 1) > RPCENT_STORAGE_MAX) { + st->buffer = NULL; + errno = ERANGE; + return (NULL); + } + st->bufsize <<= 1; + st->buffer = malloc(st->bufsize); + if (st->buffer == NULL) + return (NULL); + } + } while (res == NULL && rv == ERANGE); + if (rv != 0) + errno = rv; + + return (res); +} + +struct rpcent * +getrpcbyname(char *name) { - struct rpcdata *d = _rpcdata(); - char *p; - char *cp, **q; + union key key; - assert(val != NULL); + key.name = name; + + return (getrpc(wrap_getrpcbyname_r, key)); +} - if (d == 0) - return (0); - (void) strncpy(d->line, val, BUFSIZ); - d->line[BUFSIZ] = '\0'; - p = d->line; - p[len] = '\n'; - if (*p == '#') - return (getrpcent()); - cp = strpbrk(p, "#\n"); - if (cp == NULL) - return (getrpcent()); - *cp = '\0'; - cp = strpbrk(p, " \t"); - if (cp == NULL) - return (getrpcent()); - *cp++ = '\0'; - /* THIS STUFF IS INTERNET SPECIFIC */ - d->rpc.r_name = d->line; - while (*cp == ' ' || *cp == '\t') - cp++; - d->rpc.r_number = atoi(cp); - q = d->rpc.r_aliases = d->rpc_aliases; - cp = strpbrk(cp, " \t"); - if (cp != NULL) - *cp++ = '\0'; - while (cp && *cp) { - if (*cp == ' ' || *cp == '\t') { - cp++; - continue; - } - if (q < &(d->rpc_aliases[MAXALIASES - 1])) - *q++ = cp; - cp = strpbrk(cp, " \t"); - if (cp != NULL) - *cp++ = '\0'; - } - *q = NULL; - return (&d->rpc); +struct rpcent * +getrpcbynumber(int number) +{ + union key key; + + key.number = number; + + return (getrpc(wrap_getrpcbynumber_r, key)); } +struct rpcent * +getrpcent() +{ + union key key; + + key.number = 0; /* not used */ + + return (getrpc(wrap_getrpcent_r, key)); +} ==== //depot/projects/soc2005/nsswitch_cached/tests/getrpcent_test/Makefile#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 15 14:21:07 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB93A16A420; Fri, 15 Jul 2005 14:21:06 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8577C16A41C for ; Fri, 15 Jul 2005 14:21:06 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 58A8943D45 for ; Fri, 15 Jul 2005 14:21:06 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6FEL6M8099127 for ; Fri, 15 Jul 2005 14:21:06 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6FEL6Nd099124 for perforce@freebsd.org; Fri, 15 Jul 2005 14:21:06 GMT (envelope-from soc-bushman@freebsd.org) Date: Fri, 15 Jul 2005 14:21:06 GMT Message-Id: <200507151421.j6FEL6Nd099124@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 80264 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2005 14:21:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=80264 Change 80264 by soc-bushman@soc-bushman_stinger on 2005/07/15 14:20:54 protocols patch work started Affected files ... .. //depot/projects/soc2005/nsswitch_cached/tests/Makefile#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/getprotoent_test/Makefile#1 add .. //depot/projects/soc2005/nsswitch_cached/tests/getprotoent_test/getproto.c#1 add .. //depot/projects/soc2005/nsswitch_cached/tests/getprotoent_test/getprotoent.c#1 add .. //depot/projects/soc2005/nsswitch_cached/tests/getprotoent_test/getprotoent.h#1 add .. //depot/projects/soc2005/nsswitch_cached/tests/getprotoent_test/getprotoent_test.c#1 add .. //depot/projects/soc2005/nsswitch_cached/tests/getprotoent_test/getprotoname.c#1 add Differences ... ==== //depot/projects/soc2005/nsswitch_cached/tests/Makefile#2 (text+ko) ==== @@ -1,3 +1,3 @@ -SUBDIR+="common" "common_test" "getservent_test" "getrpcent_test" +SUBDIR+="common" "common_test" "getservent_test" "getrpcent_test" "getprotoent_test" .include From owner-p4-projects@FreeBSD.ORG Fri Jul 15 14:35:24 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82A1B16A45E; Fri, 15 Jul 2005 14:35:24 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5994116A424 for ; Fri, 15 Jul 2005 14:35:24 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D299B43D45 for ; Fri, 15 Jul 2005 14:35:23 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6FEZNxa099746 for ; Fri, 15 Jul 2005 14:35:23 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6FEZNM4099743 for perforce@freebsd.org; Fri, 15 Jul 2005 14:35:23 GMT (envelope-from soc-bushman@freebsd.org) Date: Fri, 15 Jul 2005 14:35:23 GMT Message-Id: <200507151435.j6FEZNM4099743@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 80265 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2005 14:35:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=80265 Change 80265 by soc-bushman@soc-bushman_stinger on 2005/07/15 14:34:22 #include "getrpcent.h" eliminated Affected files ... .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/getrpcent.c#3 edit Differences ... ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/rpc/getrpcent.c#3 (text+ko) ==== @@ -40,8 +40,6 @@ * Copyright (c) 1984 by Sun Microsystems, Inc. */ -#include "getrpcent.h" - #include #include #include From owner-p4-projects@FreeBSD.ORG Fri Jul 15 14:44:36 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E950416A420; Fri, 15 Jul 2005 14:44:35 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AE05C16A41C for ; Fri, 15 Jul 2005 14:44:35 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6DCAC43D45 for ; Fri, 15 Jul 2005 14:44:35 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6FEiZAM000312 for ; Fri, 15 Jul 2005 14:44:35 GMT (envelope-from soc-victor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6FEiZMR000309 for perforce@freebsd.org; Fri, 15 Jul 2005 14:44:35 GMT (envelope-from soc-victor@freebsd.org) Date: Fri, 15 Jul 2005 14:44:35 GMT Message-Id: <200507151444.j6FEiZMR000309@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-victor@freebsd.org using -f From: soc-victor To: Perforce Change Reviews Cc: Subject: PERFORCE change 80266 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2005 14:44:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=80266 Change 80266 by soc-victor@soc-victor_82.76.158.176 on 2005/07/15 14:43:44 Some code cleanup for hrStorageTable Affected files ... .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#6 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#6 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c#3 edit Differences ... ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#6 (text+ko) ==== @@ -147,7 +147,7 @@ static void hostres_idle_v(void) { if ( (time(NULL) - hrState_g.hrStorage_tbl_age) > HR_STORAGE_TBL_REFRESH ) { - HR_DPRINTF((stderr, "%s: hrStorageTable needd refresh\n ",__func__)); + HR_DPRINTF((stderr, "%s: hrStorageTable needs refresh\n ", __func__)); refresh_hrStorage_tbl_v(); } ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#6 (text+ko) ==== @@ -55,39 +55,9 @@ #define HR_DPRINTF(ARGS) #endif /*NDEBUG*/ -struct hostres_state { - FILE *utmp_fp; /*file pointer to keep an open instance of utmp*/ - kvm_t *kd; /*kernel descriptor*/ - uint32_t kernel_boot; /*boot timestamp in centi-seconds*/ - char k_boot_line[128];/*kernel boot line*/ - int max_proc; /*maximum number of processes */ - uint32_t phys_mem_size; /*physical memory size in Kb*/ - - u_char *time_to_set; /*for setting hrSystemDate*/ - struct timeval timeval_to_set; /*for setting hrSystemDate*/ - - uint64_t hr_tick; - - struct kvm_swap *swap_devs; /*for kvm_getswapinfo*/ - size_t swap_devs_len; /*idem */ - - struct statfs *fs_buf; /*for getfsstat*/ - size_t fs_buf_count; /*idem*/ - - uint32_t next_hrStorage_index; /*next int availabe for indexing the hrStorageTable*/ - time_t hrStorage_tbl_age; - - -}; /* - * Instance to keep most of the globals related to - * HOST RESOURCES MIB implementation - */ -extern struct hostres_state hrState_g; - -/* * This structure is used to hold on SNMP table entry * for HOST-RESOURCES-MIB's hrStorageTable */ @@ -104,9 +74,8 @@ TAILQ_ENTRY(hrStorageTblEntry) link; }; +TAILQ_HEAD(storage_tbl, hrStorageTblEntry); -TAILQ_HEAD(storage_tbl, hrStorageTblEntry); -extern struct storage_tbl storage_tbl; /* @@ -125,7 +94,42 @@ }; STAILQ_HEAD(storage_map_list, storageNameMapEntry); -extern struct storage_map_list storage_name_map; + + + +struct hostres_state { + FILE *utmp_fp; /*file pointer to keep an open instance of utmp*/ + kvm_t *kd; /*kernel descriptor*/ + uint32_t kernel_boot; /*boot timestamp in centi-seconds*/ + char k_boot_line[128];/*kernel boot line*/ + int max_proc; /*maximum number of processes */ + uint32_t phys_mem_size; /*physical memory size in Kb*/ + + u_char *time_to_set; /*for setting hrSystemDate*/ + struct timeval timeval_to_set; /*for setting hrSystemDate*/ + + /* next items are used for hrStorageTable */ + struct + storage_map_list storage_name_map; /*for consistent table indexing*/ + + struct + storage_tbl hr_storage_tbl; /*the head of the list with table's entries */ + uint64_t hr_tick; + struct kvm_swap *swap_devs; /*for kvm_getswapinfo*/ + size_t swap_devs_len; /*idem */ + struct statfs *fs_buf; /*for getfsstat*/ + size_t fs_buf_count; /*idem*/ + uint32_t next_hrStorage_index; /*next int availabe for indexing the hrStorageTable*/ + time_t hrStorage_tbl_age; + + +}; + +/* + * Instance to keep most of the globals related to + * HOST RESOURCES MIB implementation + */ +extern struct hostres_state hrState_g; /* * Init the things for hrStorageTable. ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c#3 (text+ko) ==== @@ -41,9 +41,6 @@ #include #include /*for getpagesize()*/ -struct storage_tbl storage_tbl = TAILQ_HEAD_INITIALIZER(storage_tbl); - -struct storage_map_list storage_name_map = STAILQ_HEAD_INITIALIZER(storage_name_map); static @@ -66,7 +63,7 @@ memset(entry, 0, sizeof(*entry)); strcpy(entry->descr, name); - STAILQ_FOREACH(map, &storage_name_map, link) + STAILQ_FOREACH(map, &hrState_g.storage_name_map, link) if (strcmp(map->a_name, entry->descr) == 0) { entry->index = map->hrIndex; map->entry_p = entry; @@ -88,7 +85,7 @@ map->hrIndex = hrState_g.next_hrStorage_index ++; strncpy(map->a_name, entry->descr, 255); map->entry_p = entry; - STAILQ_INSERT_TAIL(&storage_name_map, map, link); + STAILQ_INSERT_TAIL(&hrState_g.storage_name_map, map, link); HR_DPRINTF((stderr, "%s added into hrStorageMap at index=%d\n ",name, map->hrIndex)); } else { HR_DPRINTF((stderr, "%s exists in hrStorageMap index=%d\n ",name, map->hrIndex)); @@ -96,7 +93,7 @@ entry->index = map->hrIndex; - INSERT_OBJECT_INT(entry, &storage_tbl); + INSERT_OBJECT_INT(entry, &hrState_g.hr_storage_tbl); return entry; @@ -108,8 +105,8 @@ struct storageNameMapEntry *map; assert(entry != NULL); - TAILQ_REMOVE(&storage_tbl, entry, link); - STAILQ_FOREACH(map, &storage_name_map, link) + TAILQ_REMOVE(&hrState_g.hr_storage_tbl, entry, link); + STAILQ_FOREACH(map, &hrState_g.storage_name_map, link) if (map->entry_p == entry) { map->entry_p = NULL; break; @@ -124,7 +121,7 @@ hrStorageTblEntry_find_by_name(const char *name) { struct hrStorageTblEntry *entry = NULL; - TAILQ_FOREACH(entry, &storage_tbl, link) + TAILQ_FOREACH(entry, &hrState_g.hr_storage_tbl, link) if (strncmp(entry->descr, name, 255) == 0) return (entry); return (NULL); @@ -135,7 +132,7 @@ hrStorageTblEntry_find_by_index(int32_t idx) { struct hrStorageTblEntry *entry; - TAILQ_FOREACH(entry, &storage_tbl, link) + TAILQ_FOREACH(entry, &hrState_g.hr_storage_tbl, link) if (entry->index == idx) return (entry); return (NULL); @@ -356,6 +353,10 @@ hrState_g.next_hrStorage_index = 1; + STAILQ_INIT(&hrState_g.storage_name_map); + + TAILQ_INIT(&hrState_g.hr_storage_tbl); + hrStorage_get_vm_v(); hrStorage_get_swap_v(); @@ -380,18 +381,18 @@ hrState_g.fs_buf_count = 0; - n1 = STAILQ_FIRST(&storage_name_map); + n1 = STAILQ_FIRST(&hrState_g.storage_name_map); while (n1 != NULL) { n2 = STAILQ_NEXT(n1, link); if(n1->entry_p != NULL){ - TAILQ_REMOVE(&storage_tbl, n1->entry_p, link); + TAILQ_REMOVE(&hrState_g.hr_storage_tbl, n1->entry_p, link); free( n1->entry_p ); n1->entry_p = NULL; } free(n1); n1 = n2; } - STAILQ_INIT(&storage_name_map); + STAILQ_INIT(&hrState_g.storage_name_map); @@ -407,7 +408,7 @@ return; } /*mark each entry as missisng*/ - TAILQ_FOREACH(entry, &storage_tbl, link) + TAILQ_FOREACH(entry, &hrState_g.hr_storage_tbl, link) entry->flags &= ~HR_STORAGE_FOUND; @@ -420,7 +421,7 @@ /* * Purge items items that disappeared */ - entry = TAILQ_FIRST(&storage_tbl); + entry = TAILQ_FIRST(&hrState_g.hr_storage_tbl); while (entry != NULL) { entry_tmp = TAILQ_NEXT(entry, link); if (!(entry->flags & HR_STORAGE_FOUND)) @@ -457,7 +458,8 @@ switch (curr_op) { case SNMP_OP_GETNEXT: - if ((entry = NEXT_OBJECT_INT(&storage_tbl, &value->var, sub)) == NULL) { + if ((entry = NEXT_OBJECT_INT(&hrState_g.hr_storage_tbl, + &value->var, sub)) == NULL) { return (SNMP_ERR_NOSUCHNAME); } value->var.len = sub + 1; From owner-p4-projects@FreeBSD.ORG Fri Jul 15 15:45:51 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D80D16A420; Fri, 15 Jul 2005 15:45:51 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 26F0516A41C for ; Fri, 15 Jul 2005 15:45:51 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D323243D46 for ; Fri, 15 Jul 2005 15:45:50 +0000 (GMT) (envelope-from soc-bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6FFjoQN003348 for ; Fri, 15 Jul 2005 15:45:50 GMT (envelope-from soc-bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6FFjoDo003345 for perforce@freebsd.org; Fri, 15 Jul 2005 15:45:50 GMT (envelope-from soc-bushman@freebsd.org) Date: Fri, 15 Jul 2005 15:45:50 GMT Message-Id: <200507151545.j6FFjoDo003345@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-bushman@freebsd.org using -f From: soc-bushman To: Perforce Change Reviews Cc: Subject: PERFORCE change 80270 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2005 15:45:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=80270 Change 80270 by soc-bushman@soc-bushman_stinger on 2005/07/15 15:45:26 protocols test version finished, some syntax errors corrected Affected files ... .. //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getservent.c#12 edit .. //depot/projects/soc2005/nsswitch_cached/tests/getprotoent_test/Makefile#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/getprotoent_test/getproto.c#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/getprotoent_test/getprotoent.c#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/getprotoent_test/getprotoent.h#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/getprotoent_test/getprotoent_test.c#2 edit .. //depot/projects/soc2005/nsswitch_cached/tests/getprotoent_test/getprotoname.c#2 edit Differences ... ==== //depot/projects/soc2005/nsswitch_cached/src/lib/libc/net/getservent.c#12 (text+ko) ==== @@ -699,7 +699,7 @@ } int -getservbyport_r)(int port, const char *proto, struct servent *serv, char *buffer, +getservbyport_r(int port, const char *proto, struct servent *serv, char *buffer, size_t bufsize, struct servent **result) { static const struct servent_mdata mdata = { nss_lt_id, 0 }; @@ -813,7 +813,7 @@ wrap_getservent_r(struct key key, struct servent *serv, char *buffer, size_t bufsize, struct servent **res) { - return getservent_r(serv, buffer, bufsize, res)); + return (getservent_r(serv, buffer, bufsize, res)); } static struct servent * ==== //depot/projects/soc2005/nsswitch_cached/tests/getprotoent_test/Makefile#2 (text+ko) ==== ==== //depot/projects/soc2005/nsswitch_cached/tests/getprotoent_test/getproto.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #include __FBSDID("$FreeBSD: src/lib/libc/net/getproto.c,v 1.4 2005/04/19 14:41:13 ume Exp $"); -#include +/*#include #include "netdb_private.h" int @@ -65,3 +65,4 @@ return (NULL); return (&pd->proto); } +*/ ==== //depot/projects/soc2005/nsswitch_cached/tests/getprotoent_test/getprotoent.c#2 (text+ko) ==== @@ -37,18 +37,491 @@ #include __FBSDID("$FreeBSD: src/lib/libc/net/getprotoent.c,v 1.5 2005/04/28 15:32:55 ume Exp $"); +#include "getprotoent.h" + #include #include +#include #include +#include #include #include #include #include "namespace.h" +#include "nss_tls.h" #include "reentrant.h" #include "un-namespace.h" -#include "netdb_private.h" +//#include "netdb_private.h" + +/* nsswitch declarations */ +enum constants +{ + SETPROTOENT = 1, + ENDPROTOENT = 2, + PROTOENT_STORAGE_INITIAL = 1 << 10, /* 1 KByte */ + PROTOENT_STORAGE_MAX = 1 << 20, /* 1 MByte */ +}; + +static const ns_src defaultsrc[] = { + { NSSRC_FILES, NS_SUCCESS }, + { NULL, 0 } +}; + +/* files backend declarations */ +struct files_state +{ + FILE *fp; + int stayopen; +}; +static void files_endstate(void *); +NSS_TLS_HANDLING(files); + +static int files_protoent(void *, void *, va_list); +static int files_setprotoent(void *, void *, va_list); + +/* get** wrappers for get**_r functions declarations */ +struct protoent_state { + struct protoent pe; + char *buffer; + size_t bufsize; +}; +static void protoent_endstate(void *); +NSS_TLS_HANDLING(protoent); + +union key { + const char *name; + int proto; +}; + +static int wrap_getprotobyname_r(union key, struct protoent *, char *, + size_t, struct protoent **); +static int wrap_getprotobynumber_r(union key, struct protoent *, char *, + size_t, struct protoent **); +static int wrap_getprotoent_r(union key, struct protoent *, char *, + size_t, struct protoent **); +static struct protoent *getpe(int (*fn)(union key, struct protoent *, char *, + size_t, struct protoent **), union key); + +static int +protoent_unpack(char *p, struct protoent *pe, char **aliases, + size_t aliases_size, int *errnop) +{ + char *cp, **q, *endp; + long l; + + if (*p == '#') + return (-1); + cp = strpbrk(p, "#\n"); + if (cp != NULL) + *cp = '\0'; + pe->p_name = p; + cp = strpbrk(p, " \t"); + if (cp == NULL) + return (-1); + *cp++ = '\0'; + while (*cp == ' ' || *cp == '\t') + cp++; + p = strpbrk(cp, " \t"); + if (p != NULL) + *p++ = '\0'; + l = strtol(cp, &endp, 10); + if (endp == cp || *endp != '\0' || l < 0 || l > USHRT_MAX) + return -1; + pe->p_proto = l; + q = pe->p_aliases = aliases; + if (p != NULL) { + cp = p; + while (cp && *cp) { + if (*cp == ' ' || *cp == '\t') { + cp++; + continue; + } + if (q < &(aliases[aliases_size - 1])) + *q++ = cp; + else { + *errnop = ERANGE; + return -1; + } + cp = strpbrk(cp, " \t"); + if (cp != NULL) + *cp++ = '\0'; + } + } + *q = NULL; + return (0); +} + +/* files backend implementation */ +static void +files_endstate(void *p) +{ + FILE * f; + + if (p == NULL) + return; + + f = ((struct files_state *)p)->fp; + if (f != NULL) + fclose(f); + + free(p); +} + +static int +files_protoent(void *retval, void *mdata, va_list ap) +{ + char *name; + int number; + struct protoent *pe; + char *buffer; + size_t bufsize; + int *errnop; + + char *line; + size_t linesize; + char **aliases; + int aliases_size; + char **rp; + + struct files_state *st; + int rv; + int stayopen; + enum nss_lookup_type how; + + how = (enum nss_lookup_type)mdata; + switch (how) + { + case nss_lt_name: + name = va_arg(ap, char *); + break; + case nss_lt_id: + number = va_arg(ap, int); + break; + case nss_lt_all: + break; + default: + return (NS_NOTFOUND); + } + + pe = va_arg(ap, struct protoent *); + buffer = va_arg(ap, char *); + bufsize = va_arg(ap, size_t); + errnop = va_arg(ap, int *); + + *errnop = files_getstate(&st); + if (*errnop != 0) + return (NS_UNAVAIL); + + if (st->fp == NULL && (st->fp = fopen(_PATH_PROTOCOLS, "r")) == NULL) { + *errnop = errno; + return (NS_UNAVAIL); + } + + if (how == nss_lt_all) + stayopen = 1; + else { + rewind(st->fp); + stayopen = st->stayopen; + } + + do { + if ((line = fgetln(st->fp, &linesize)) == NULL) { + *errnop = errno; + rv = NS_RETURN; + break; + } + + if (bufsize <= linesize + _ALIGNBYTES + sizeof(char *)) { + *errnop = ERANGE; + rv = NS_RETURN; + break; + } + + aliases = (char **)_ALIGN(&buffer[linesize+1]); + aliases_size = (buffer + bufsize - (char *)aliases)/sizeof(char *); + if (aliases_size < 1) { + *errnop = ERANGE; + rv = NS_RETURN; + break; + } + + memcpy(buffer, line, linesize); + buffer[linesize] = '\0'; + + rv = protoent_unpack(buffer, pe, aliases, aliases_size, errnop); + if (rv != 0) { + if (*errnop == 0) { + rv = NS_NOTFOUND; + continue; + } + else { + rv = NS_RETURN; + break; + } + } + + switch (how) + { + case nss_lt_name: + if (strcmp(pe->p_name, name) == 0) + goto done; + for (rp = pe->p_aliases; *rp != NULL; rp++) { + if (strcmp(*rp, name) == 0) + goto done; + } + rv = NS_NOTFOUND; + continue; +done: + rv = NS_SUCCESS; + break; + case nss_lt_id: + rv = (pe->p_proto == number) ? NS_SUCCESS : NS_NOTFOUND; + break; + case nss_lt_all: + rv = NS_SUCCESS; + break; + } + + } while (!(rv & NS_TERMINATE)); + + if (!stayopen && st->fp!=NULL) { + fclose(st->fp); + st->fp = NULL; + } + + if ((rv == NS_SUCCESS) && (retval != NULL)) + *((struct protoent **)retval) = pe; + + return (rv); +} + +static int +files_setprotoent(void *retval, void *mdata, va_list ap) +{ + struct files_state *st; + int rv; + int f; + + rv = files_getstate(&st); + if (rv != 0) + return (NS_UNAVAIL); + + switch ((enum constants)mdata) + { + case SETPROTOENT: + f = va_arg(ap,int); + if (st->fp == NULL) + st->fp = fopen(_PATH_PROTOCOLS, "r"); + else + rewind(st->fp); + st->stayopen |= f; + break; + case ENDPROTOENT: + if (st->fp != NULL) { + fclose(st->fp); + st->fp = NULL; + } + st->stayopen = 0; + break; + default: + break; + } + + return (NS_UNAVAIL); +} + +/* get**_r functions implementation */ +int +DECORATED(getprotobyname_r)(const char *name, struct protoent *pe, char *buffer, + size_t bufsize, struct protoent **result) +{ + static const ns_dtab dtab[] = { + { NSSRC_FILES, files_protoent, (void *)nss_lt_name }, + { NULL, NULL, NULL } + }; + + int rv, ret_errno; + + ret_errno = 0; + *result = NULL; + rv = nsdispatch(result, dtab, NSDB_PROTOCOLS, "getprotobyname_r", defaultsrc, + name, pe, buffer, bufsize, &ret_errno); + + if (rv == NS_SUCCESS) + return (0); + else + return (ret_errno); +} + +int +DECORATED(getprotobynumber_r)(int number, struct protoent *pe, char *buffer, + size_t bufsize, struct protoent **result) +{ + static const ns_dtab dtab[] = { + { NSSRC_FILES, files_protoent, (void *)nss_lt_id }, + { NULL, NULL, NULL } + }; + int rv, ret_errno; + + ret_errno = 0; + *result = NULL; + rv = nsdispatch(result, dtab, NSDB_PROTOCOLS, "getprotobynumber_r", defaultsrc, + number, pe, buffer, bufsize, &ret_errno); + + if (rv == NS_SUCCESS) + return (0); + else + return (ret_errno); +} + +int +DECORATED(getprotoent_r)(struct protoent *pe, char *buffer, size_t bufsize, + struct protoent **result) +{ + static const ns_dtab dtab[] = { + { NSSRC_FILES, files_protoent, (void *)nss_lt_all }, + { NULL, NULL, NULL } + }; + int rv, ret_errno; + + ret_errno = 0; + *result = NULL; + rv = nsdispatch(result, dtab, NSDB_PROTOCOLS, "getprotoent_r", defaultsrc, + pe, buffer, bufsize, &ret_errno); + + if (rv == NS_SUCCESS) + return (0); + else + return (ret_errno); +} + +void +DECORATED(setprotoent)(int stayopen) +{ + static const ns_dtab dtab[] = { + { NSSRC_FILES, files_setprotoent, (void *)SETPROTOENT }, + { NULL, NULL, NULL } + }; + + (void)nsdispatch(NULL, dtab, NSDB_PROTOCOLS, "setprotoent", defaultsrc, stayopen); +} + +void +DECORATED(endprotoent)() +{ + static const ns_dtab dtab[] = { + { NSSRC_FILES, files_setprotoent, (void *)ENDPROTOENT }, + { NULL, NULL, NULL } + }; + + (void)nsdispatch(NULL, dtab, NSDB_PROTOCOLS, "endprotoent", defaultsrc); +} + +/* get** wrappers for get**_r functions implementation */ +static void +protoent_endstate(void *p) +{ + if (p == NULL) + return; + + free(((struct protoent_state *)p)->buffer); + free(p); +} + +static int +wrap_getprotobyname_r(union key key, struct protoent *pe, char *buffer, size_t bufsize, + struct protoent **res) +{ + return (DECORATED(getprotobyname_r)(key.name, pe, buffer, bufsize, res)); +} + +static int +wrap_getprotobynumber_r(union key key, struct protoent *pe, char *buffer, size_t bufsize, + struct protoent **res) +{ + return (DECORATED(getprotobynumber_r)(key.proto, pe, buffer, bufsize, res)); +} + +static int +wrap_getprotoent_r(union key key, struct protoent *pe, char *buffer, size_t bufsize, + struct protoent **res) +{ + return (DECORATED(getprotoent_r)(pe, buffer, bufsize, res)); +} + +static struct protoent * +getpe(int (*fn)(union key, struct protoent *, char *, size_t, struct protoent **), + union key key) +{ + int rv; + struct protoent *res; + struct protoent_state * st; + + rv=protoent_getstate(&st); + if (rv != 0) { + errno = rv; + return NULL; + } + + if (st->buffer == NULL) { + st->buffer = malloc(PROTOENT_STORAGE_INITIAL); + if (st->buffer == NULL) + return (NULL); + st->bufsize = PROTOENT_STORAGE_INITIAL; + } + do { + rv = fn(key, &st->pe, st->buffer, st->bufsize, &res); + if (res == NULL && rv == ERANGE) { + free(st->buffer); + if ((st->bufsize << 1) > PROTOENT_STORAGE_MAX) { + st->buffer = NULL; + errno = ERANGE; + return (NULL); + } + st->bufsize <<= 1; + st->buffer = malloc(st->bufsize); + if (st->buffer == NULL) + return (NULL); + } + } while (res == NULL && rv == ERANGE); + if (rv != 0) + errno = rv; + + return (res); +} + +struct protoent * +DECORATED(getprotobyname)(const char *name) +{ + union key key; + + key.name = name; + + return (getpe(wrap_getprotobyname_r, key)); +} + +struct protoent * +DECORATED(getprotobynumber)(int number) +{ + union key key; + + key.proto = number; + + return (getpe(wrap_getprotobynumber_r, key)); +} + +struct protoent * +DECORATED(getprotoent)() +{ + union key key; + + key.proto = 0; /* not used */ + + return (getpe(wrap_getprotoent_r, key)); +} + -static struct protodata protodata; +/*static struct protodata protodata; static thread_key_t protodata_key; static once_t protodata_init_once = ONCE_INITIALIZER; static int protodata_thr_keycreated = 0; @@ -201,3 +674,4 @@ return (NULL); return (&pd->proto); } +*/ ==== //depot/projects/soc2005/nsswitch_cached/tests/getprotoent_test/getprotoent.h#2 (text+ko) ==== @@ -1,0 +1,21 @@ +#ifndef __NSSWITCH_CACHED_GETPROTOENT_H__ +#define __NSSWITCH_CACHED_GETPROTOENT_H__ + +#include "../common/test.h" +#include "../common/debug.h" +#include + +int DECORATED(getprotobyname_r)(const char *, struct protoent *, char *, + size_t, struct protoent **); +int DECORATED(getprotobynumber_r)(int, struct protoent *, char *, + size_t, struct protoent **); +int DECORATED(getprotoent_r)(struct protoent *, char *, size_t, + struct protoent **); + +struct protoent *DECORATED(getprotobyname)(const char *); +struct protoent *DECORATED(getprotobynumber)(int); +struct protoent *DECORATED(getprotoent)(); +void DECORATED(setprotoent)(int); +void DECORATED(endprotoent)(); + +#endif ==== //depot/projects/soc2005/nsswitch_cached/tests/getprotoent_test/getprotoent_test.c#2 (text+ko) ==== @@ -1,6 +1,6 @@ #include "../common/test.h" #include "../common/debug.h" -#include "getrpcent.h" +#include "getprotoent.h" #include #include #include @@ -9,8 +9,402 @@ #include #include +static struct protoent * +clone_protoent(struct protoent *proto) +{ + struct protoent *res; + char **cp; + int aliases_num; + + if (proto == NULL) + return (NULL); + + res = (struct protoent *)malloc(sizeof(struct protoent)); + assert(res != NULL); + memset(res, 0, sizeof(struct protoent)); + + res->p_name = strdup(proto->p_name); + assert(res->p_name != NULL); + res->p_proto = proto->p_proto; + + aliases_num = 0; + for (cp = proto->p_aliases; *cp; ++cp) + ++aliases_num; + + res->p_aliases = (char **)malloc((aliases_num+1) * (sizeof(char *))); + assert(res->p_aliases != NULL); + memset(res->p_aliases, 0, (aliases_num+1) * (sizeof(char *))); + + for (cp = proto->p_aliases; *cp; ++cp) { + res->p_aliases[cp - proto->p_aliases] = strdup(*cp); + assert(res->p_aliases[cp - proto->p_aliases] != NULL); + } + + return res; +} + +static void +free_protoent(struct protoent *proto) +{ + char **cp; + + if (proto == NULL) + return; + + free(proto->p_name); + + for (cp = proto->p_aliases; *cp; ++cp) + free(*cp); + + free(proto); +} + +static void +result_info(int rv, struct protoent *result) +{ + if (rv == 0) { + if (result == NULL) + __test_log2("success: entry was not found\n"); + else { + __test_log2("success: entry was found\n"); + __test_log2("name: %s\n", result->p_name); + __test_log2("proto: %d\n", htons(result->p_proto)); + + if (*(result->p_aliases)!='\0') { + char ** cp; + + __test_log2("aliases:\n"); + for (cp=result->p_aliases; *cp; ++cp) + __test_log2("\t\t%s\n",*cp); + } else + __test_log2("\tno aliases\n"); + } + } else + __test_log2("failure: code=%d, details='%s'",rv,strerror(rv)); +} + +static int +result_compare(struct protoent *proto1, struct protoent *proto2) +{ + char **c1, **c2; + + if (proto1 == proto2) + return 0; + + if ((proto1 == NULL) || (proto2 == NULL)) + return -1; + + if ( (strcmp(proto1->p_name,proto2->p_name)!=0) || + (proto1->p_proto != proto2->p_proto)) + return -1; + + c1=proto1->p_aliases; + c2=proto2->p_aliases; + for (;*c1 && *c2; ++c1, ++c2) + if (strcmp(*c1,*c2)!=0) + return -1; + + if ((*c1!='\0') || (*c2!='\0')) + return -1; + + return 0; +} + +static enum __test_result +getprotoent_test1() +{ + struct protoent *result1; + struct protoent *result2; + + int rv; + + rv = 0; + DECORATED(setprotoent)(1); + setprotoent(1); + do + { + //TRACE_OFF(); + result1 = DECORATED(getprotoent)(); + result2 = getprotoent(); + + rv = result_compare(result1, result2); + + result_info(0, result1); + result_info(0, result2); + //TRACE_ON(); + } while (((result1 != NULL) || (result2 != NULL) )&& (rv == 0)); + + return (rv == 0) ? T_PASSED : T_FAILED; +} + +struct protoent * +trivial_getprotobyname(const char *name) +{ + char **cp; + struct protoent *result; + + DECORATED(setprotoent)(1); + while ( (result = DECORATED(getprotoent)()) != NULL) { + if (strcmp(result->p_name, name) == 0) + goto fin; + + for (cp=result->p_aliases; *cp; ++cp) + if (strcmp(*cp, name) == 0) + goto fin; + } + +fin: + DECORATED(endprotoent)(); + return (result); +} + +struct protoent * +trivial_getprotobynumber(int number) +{ + struct protoent *result; + + DECORATED(setprotoent)(1); + while ( (result = DECORATED(getprotoent)()) != NULL) { + if (result->p_proto == number) + break; + } + + DECORATED(endprotoent)(); + return (result); +} + +static enum __test_result +getprotobyname_test1() +{ + struct protoent *result_model; + struct protoent *result1; + struct protoent *result2; + + int rv; + char **cp; + + setprotoent(1); + while ( (result_model = getprotoent()) != NULL) { + __test_log2("trying name: %s\n", result_model->p_name); + + result1 = clone_protoent( DECORATED(getprotobyname)(result_model->p_name) ); + result2 = clone_protoent( trivial_getprotobyname(result_model->p_name) ); + + rv = result_compare(result1, result2); + result_info(0, result1); + result_info(0, result2); + free_protoent(result1); + free_protoent(result2); + if (rv != 0) + break; + + for (cp = result_model->p_aliases; *cp; ++cp) + { + __test_log2("trying name: %s\n", *cp); + + result1 = clone_protoent( DECORATED(getprotobyname)(*cp) ); + result2 = clone_protoent( trivial_getprotobyname(*cp) ); + + rv = result_compare(result1, result2); + free_protoent(result1); + free_protoent(result2); + if (rv != 0) + break; + } + + if (rv != 0) + break; + } + + endprotoent(); + return (rv == 0) ? T_PASSED : T_FAILED; +} + +static enum __test_result +getprotobynumber_test1() +{ + struct protoent *result_model; + struct protoent *result1; + struct protoent *result2; + + int rv; + + setprotoent(1); + while ( (result_model = getprotoent()) != NULL) { + __test_log2("trying number: %d\n", result_model->p_proto); + + result1 = clone_protoent( DECORATED(getprotobynumber)(result_model->p_proto) ); + result2 = clone_protoent( trivial_getprotobynumber(result_model->p_proto) ); + + rv = result_compare(result1, result2); + free_protoent(result1); + free_protoent(result2); + if (rv != 0) + break; + } + + endprotoent(); + return (rv == 0) ? T_PASSED : T_FAILED; +} + +static enum __test_result +getprotobyname_test2() +{ + struct protoent *result_model; + struct protoent *result1; + struct protoent *result2; + + int counter; + int rv; + char **cp; + + counter = 0; + setprotoent(1); + while ( (result_model = getprotoent()) != NULL) { + switch (counter % 2) + { + case 0: + break; + case 1: + result_model->p_name[0]='a'; + break; + }; + + __test_log2("trying name: %s\n", result_model->p_name); + + result1 = clone_protoent( DECORATED(getprotobyname)(result_model->p_name) ); + result2 = clone_protoent( trivial_getprotobyname(result_model->p_name) ); + + rv = result_compare(result1, result2); + free_protoent(result1); + free_protoent(result2); + if (rv != 0) + break; + + for (cp = result_model->p_aliases; *cp; ++cp) + { + switch (counter % 2) + { + case 0: + break; + case 1: + (*cp)[0]='a'; + break; + }; + __test_log2("trying name: %s\n", *cp); + + result1 = clone_protoent( DECORATED(getprotobyname)(*cp) ); + result2 = clone_protoent( trivial_getprotobyname(*cp) ); + + rv = result_compare(result1, result2); + free_protoent(result1); + free_protoent(result2); + if (rv != 0) + break; + } + + if (rv != 0) + break; + + ++counter; + } + + endprotoent(); + return (rv == 0) ? T_PASSED : T_FAILED; +} + +static enum __test_result +getprotobynumber_test2() +{ + struct protoent *result_model; + struct protoent *result1; + struct protoent *result2; + + int counter; + int rv; + + counter = 0; + setprotoent(1); + while ( (result_model = getprotoent()) != NULL) { + switch (counter % 2) + { + case 0: + break; + case 1: + result_model->p_proto = htonl(result_model->p_proto); + break; + } + __test_log2("trying number: %d\n", result_model->p_proto); + + result1 = clone_protoent( DECORATED(getprotobynumber)(result_model->p_proto) ); + result2 = clone_protoent( trivial_getprotobynumber(result_model->p_proto) ); + + rv = result_compare(result1, result2); + free_protoent(result1); + free_protoent(result2); + if (rv != 0) + break; + + ++counter; + } + + endprotoent(); + return (rv == 0) ? T_PASSED : T_FAILED; +} + +static enum __test_result +protoent_stress_test() +{ + const size_t bigsize = 65000; + char *bigname; + + (void)DECORATED(getprotobyname)(""); + (void)DECORATED(getprotobynumber)(-1); + + bigname = (char *)malloc(bigsize); + assert(bigname != NULL); + memset(bigname, 'a', bigsize - 1); + bigname[bigsize - 1] = '\0'; + + (void)DECORATED(getprotobyname)(bigname); + + return (T_PASSED); +} + int main(int argc, char *argv[]) -{ - return (0); +{ + struct test_system *tsystem; + struct test_info *tinfo; + + tsystem = __init_test_system("getproto* nsswitch testing"); + assert(tsystem != NULL); + + tinfo = __create_test_info("getprotoent_test1", getprotoent_test1, 0); + assert(tinfo != NULL); + __register_test_info(tsystem, tinfo); + + tinfo = __create_test_info("getprotobyname_test1", getprotobyname_test1, 1); + assert(tinfo != NULL); + __register_test_info(tsystem, tinfo); + + tinfo = __create_test_info("getprotobynumber_test1", getprotobynumber_test1, 1); + assert(tinfo != NULL); + __register_test_info(tsystem, tinfo); + + tinfo = __create_test_info("getprotobyname_test2", getprotobyname_test2, 1); + assert(tinfo != NULL); + __register_test_info(tsystem, tinfo); + + tinfo = __create_test_info("getprotobynumber_test2", getprotobynumber_test2, 1); + assert(tinfo != NULL); + __register_test_info(tsystem, tinfo); + + tinfo = __create_test_info("protoent_stress_test", protoent_stress_test, 1); + assert(tinfo != NULL); + __register_test_info(tsystem, tinfo); + + __process_tests(tsystem, NULL, NULL); + __destroy_test_system(tsystem); + return 0; } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jul 15 16:29:58 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6D1A16A420; Fri, 15 Jul 2005 16:29:57 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B71CD16A41C for ; Fri, 15 Jul 2005 16:29:57 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A0AE43D46 for ; Fri, 15 Jul 2005 16:29:57 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6FGTvaw007155 for ; Fri, 15 Jul 2005 16:29:57 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6FGTvRV007152 for perforce@freebsd.org; Fri, 15 Jul 2005 16:29:57 GMT (envelope-from sam@freebsd.org) Date: Fri, 15 Jul 2005 16:29:57 GMT Message-Id: <200507151629.j6FGTvRV007152@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 80276 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2005 16:29:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=80276 Change 80276 by sam@sam_ebb on 2005/07/15 16:29:32 IFC Affected files ... .. //depot/projects/wifi/sys/dev/pccard/pccard.c#9 integrate Differences ... ==== //depot/projects/wifi/sys/dev/pccard/pccard.c#9 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard.c,v 1.107 2005/07/14 20:40:42 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pccard/pccard.c,v 1.108 2005/07/15 01:43:08 imp Exp $"); #include #include @@ -967,6 +967,7 @@ struct pccard_ivar *devi = PCCARD_IVAR(child); struct pccard_function *pf = devi->pf; struct pccard_softc *sc = PCCARD_SOFTC(bus); + int i; device_printf(bus, ""); printf(" (manufacturer=0x%04x, product=0x%04x, function_type=%d) " From owner-p4-projects@FreeBSD.ORG Fri Jul 15 16:29:59 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76A2E16A45D; Fri, 15 Jul 2005 16:29:58 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1B6F416A42D for ; Fri, 15 Jul 2005 16:29:58 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD26843D46 for ; Fri, 15 Jul 2005 16:29:57 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6FGTv27007162 for ; Fri, 15 Jul 2005 16:29:57 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6FGTvrp007158 for perforce@freebsd.org; Fri, 15 Jul 2005 16:29:57 GMT (envelope-from sam@freebsd.org) Date: Fri, 15 Jul 2005 16:29:57 GMT Message-Id: <200507151629.j6FGTvrp007158@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 80277 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2005 16:29:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=80277 Change 80277 by sam@sam_ebb on 2005/07/15 16:29:56 misc fixups after ifc Affected files ... .. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#4 edit .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#6 edit .. //depot/projects/wifi/sys/dev/wi/if_wi.c#16 edit Differences ... ==== //depot/projects/wifi/sys/dev/ipw/if_ipw.c#4 (text+ko) ==== @@ -814,6 +814,7 @@ case IEEE80211_M_AHDEMO: case IEEE80211_M_HOSTAP: + case IEEE80211_M_WDS: /* should not get there */ break; } @@ -1830,6 +1831,7 @@ switch (ic->ic_opmode) { case IEEE80211_M_STA: case IEEE80211_M_HOSTAP: + case IEEE80211_M_WDS: /* XXX */ data = htole32(IPW_MODE_BSS); break; ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#6 (text+ko) ==== @@ -874,6 +874,7 @@ case IEEE80211_M_AHDEMO: case IEEE80211_M_HOSTAP: + case IEEE80211_M_WDS: /* should not get there */ break; } ==== //depot/projects/wifi/sys/dev/wi/if_wi.c#16 (text+ko) ==== @@ -695,6 +695,9 @@ wi_write_val(sc, WI_RID_PORTTYPE, WI_PORTTYPE_ADHOC); wi_cmd(sc, WI_CMD_DEBUG | (WI_TEST_MONITOR << 8), 0, 0, 0); break; + case IEEE80211_M_WDS: + /* XXXX */ + break; } /* Intersil interprets this RID as joining ESS even in IBSS mode */ @@ -1301,6 +1304,9 @@ case IEEE80211_M_MONITOR: imr->ifm_active |= IFM_IEEE80211_MONITOR; break; + case IEEE80211_M_WDS: + /* XXXX */ + break; } } @@ -2867,8 +2873,11 @@ static void wi_dump_pkt(struct wi_frame *wh, struct ieee80211_node *ni, int rssi) { - ieee80211_dump_pkt((u_int8_t *) &wh->wi_whdr, sizeof(wh->wi_whdr), - ni ? ni->ni_rates.rs_rates[ni->ni_txrate] & IEEE80211_RATE_VAL : -1, rssi); + if (ni != NULL) + ieee80211_dump_pkt(ni->ni_ic, + (u_int8_t *) &wh->wi_whdr, sizeof(wh->wi_whdr), + ni->ni_rates.rs_rates[ni->ni_txrate] & IEEE80211_RATE_VAL, + rssi); printf(" status 0x%x rx_tstamp1 %u rx_tstamp0 0x%u rx_silence %u\n", le16toh(wh->wi_status), le16toh(wh->wi_rx_tstamp1), le16toh(wh->wi_rx_tstamp0), wh->wi_rx_silence); From owner-p4-projects@FreeBSD.ORG Fri Jul 15 16:31:00 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F074816A420; Fri, 15 Jul 2005 16:30:59 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CC17616A41C for ; Fri, 15 Jul 2005 16:30:59 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E3EB43D49 for ; Fri, 15 Jul 2005 16:30:59 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6FGUxYp007298 for ; Fri, 15 Jul 2005 16:30:59 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6FGUxNO007295 for perforce@freebsd.org; Fri, 15 Jul 2005 16:30:59 GMT (envelope-from sam@freebsd.org) Date: Fri, 15 Jul 2005 16:30:59 GMT Message-Id: <200507151630.j6FGUxNO007295@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 80278 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2005 16:31:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=80278 Change 80278 by sam@sam_ebb on 2005/07/15 16:30:41 get stuff working again after ifc Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#16 edit .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#51 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#16 (text+ko) ==== @@ -149,6 +149,7 @@ #define M_LINK0 M_PROTO1 /* WEP requested */ #define M_PWR_SAV M_PROTO4 /* bypass PS handling */ #define M_MORE_DATA M_PROTO5 /* more data frames to follow */ +#define M_FF 0x20000 /* fast frame */ /* * Encode WME access control bits in the PROTO flags. * This is safe since it's passed directly in to the ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#51 (text+ko) ==== @@ -140,7 +140,7 @@ struct ieee80211_frame *wh; struct ieee80211_key *key; struct ether_header *eh; - int len, hdrspace; + int hdrspace; u_int8_t dir, type, subtype; u_int8_t *bssid; u_int16_t rxseq; From owner-p4-projects@FreeBSD.ORG Fri Jul 15 16:32:02 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B375016A420; Fri, 15 Jul 2005 16:32:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8D32E16A41C for ; Fri, 15 Jul 2005 16:32:01 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5DBB943D46 for ; Fri, 15 Jul 2005 16:32:01 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6FGW176007332 for ; Fri, 15 Jul 2005 16:32:01 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6FGW1eB007329 for perforce@freebsd.org; Fri, 15 Jul 2005 16:32:01 GMT (envelope-from sam@freebsd.org) Date: Fri, 15 Jul 2005 16:32:01 GMT Message-Id: <200507151632.j6FGW1eB007329@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 80279 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2005 16:32:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=80279 Change 80279 by sam@sam_ebb on 2005/07/15 16:31:10 add ff+dturbo stuff back after ifc Affected files ... .. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#40 edit Differences ... ==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#40 (text+ko) ==== @@ -411,6 +411,18 @@ } static void +set80211fastframes(const char *val, int d, int s, const struct afswtch *rafp) +{ + set80211(s, IEEE80211_IOC_FF, d, 0, NULL); +} + +static void +set80211dturbo(const char *val, int d, int s, const struct afswtch *rafp) +{ + set80211(s, IEEE80211_IOC_TURBOP, d, 0, NULL); +} + +static void set80211chanlist(const char *val, int d, int s, const struct afswtch *rafp) { struct ieee80211req_chanlist chanlist; @@ -1547,6 +1559,21 @@ } else wme = 0; + ireq.i_type = IEEE80211_IOC_FF; + if (ioctl(s, SIOCG80211, &ireq) != -1) { + if (ireq.i_val) + LINE_CHECK("%cff", spacer); + else if (verbose) + LINE_CHECK("%c-ff", spacer); + } + ireq.i_type = IEEE80211_IOC_TURBOP; + if (ioctl(s, SIOCG80211, &ireq) != -1) { + if (ireq.i_val) + LINE_CHECK("%cdturbo", spacer); + else if (verbose) + LINE_CHECK("%c-dturbo", spacer); + } + if (opmode == IEEE80211_M_HOSTAP) { ireq.i_type = IEEE80211_IOC_HIDESSID; if (ioctl(s, SIOCG80211, &ireq) != -1) { @@ -1805,6 +1832,10 @@ #endif DEF_CMD("pureg", 1, set80211pureg), DEF_CMD("-pureg", 0, set80211pureg), + DEF_CMD("ff", 1, set80211fastframes), + DEF_CMD("-ff", 0, set80211fastframes), + DEF_CMD("dturbo", 1, set80211dturbo), + DEF_CMD("-dturbo", 0, set80211dturbo), }; static struct afswtch af_ieee80211 = { .af_name = "af_ieee80211", From owner-p4-projects@FreeBSD.ORG Fri Jul 15 17:24:08 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA70F16A420; Fri, 15 Jul 2005 17:24:07 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8096216A41C for ; Fri, 15 Jul 2005 17:24:07 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A74F43D49 for ; Fri, 15 Jul 2005 17:24:07 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6FHO7B1016700 for ; Fri, 15 Jul 2005 17:24:07 GMT (envelope-from soc-saturnero@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6FHO6DS016697 for perforce@freebsd.org; Fri, 15 Jul 2005 17:24:06 GMT (envelope-from soc-saturnero@freebsd.org) Date: Fri, 15 Jul 2005 17:24:06 GMT Message-Id: <200507151724.j6FHO6DS016697@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-saturnero@freebsd.org using -f From: soc-saturnero To: Perforce Change Reviews Cc: Subject: PERFORCE change 80282 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2005 17:24:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=80282 Change 80282 by soc-saturnero@soc-saturnero_sberta on 2005/07/15 17:23:59 Adding a copyright notice and Makefile. Initial work on scripts. Affected files ... .. //depot/projects/soc2005/freesbie/COPYING#1 add .. //depot/projects/soc2005/freesbie/Makefile#1 add .. //depot/projects/soc2005/freesbie/ToDo#2 edit .. //depot/projects/soc2005/freesbie/conf/freesbie.defaults.conf#2 edit .. //depot/projects/soc2005/freesbie/scripts/launch.sh#1 add .. //depot/projects/soc2005/freesbie/scripts/mtree.sh#1 add Differences ... ==== //depot/projects/soc2005/freesbie/ToDo#2 (text+ko) ==== @@ -15,6 +15,7 @@ buildworld installworld [...] + extra.sh #Runs requested extra scripts. preparefs buildiso buildimage ==== //depot/projects/soc2005/freesbie/conf/freesbie.defaults.conf#2 (text+ko) ==== @@ -1,6 +1,14 @@ -# Default configuration file. Don't modify it, create your own -# freesbie.conf instead. Please note that the file will be included by -# a Makefile, so see make(1) for the right syntax to use. +#!/bin/sh +# +# Default configuration file. +# +# Copyright (c) 2005 Dario Freni +# +# See COPYING for license terms. +# +# $FreeBSD$ +# +# Don't modify it, create your own freesbie.conf instead. # Path where files are installed. BASEDIR="/usr/local/freesbie-fs" From owner-p4-projects@FreeBSD.ORG Fri Jul 15 18:11:11 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD66716A420; Fri, 15 Jul 2005 18:11:10 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 86BB516A41C for ; Fri, 15 Jul 2005 18:11:10 +0000 (GMT) (envelope-from soc-tyler@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3879E43D45 for ; Fri, 15 Jul 2005 18:11:10 +0000 (GMT) (envelope-from soc-tyler@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6FIBA3Z018694 for ; Fri, 15 Jul 2005 18:11:10 GMT (envelope-from soc-tyler@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6FIB9Sm018691 for perforce@freebsd.org; Fri, 15 Jul 2005 18:11:09 GMT (envelope-from soc-tyler@freebsd.org) Date: Fri, 15 Jul 2005 18:11:09 GMT Message-Id: <200507151811.j6FIB9Sm018691@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-tyler@freebsd.org using -f From: soc-tyler To: Perforce Change Reviews Cc: Subject: PERFORCE change 80288 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2005 18:11:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=80288 Change 80288 by soc-tyler@soc-tyler_launchd on 2005/07/15 18:10:21 Remove all the build errors regarding launchd.c Inside launch.h check to make sure we're not building on top of Darwin/Mac OS X, if so #define _BUILD_DARWIN_. Using that macro to stub out any Darwin specifics inside of launchd.c (but keeping them around for reference.) In theory, by the time I'm done with porting, it will still be back-portable to Darwin. Affected files ... .. //depot/projects/soc2005/launchd/NOTES#5 edit .. //depot/projects/soc2005/launchd/includes/launch.h#3 edit .. //depot/projects/soc2005/launchd/includes/launchd.h#4 edit .. //depot/projects/soc2005/launchd/launchd.c#4 edit Differences ... ==== //depot/projects/soc2005/launchd/NOTES#5 (text+ko) ==== @@ -18,7 +18,12 @@ fixed to accomodate. - o Regarding init(8) I'm still wondering whether or not it'd be best to take the stock - FreeBSD init(8) code, or the code that zarzycki@ and NeXT have modified for - Mac OS X (and NeXTStep). i.e. Fresh start or hackery begets hackery... - + o The stock source comes with a modified init.c from Mac OS 10.3 and + previously which was derived from the standard BSD init.c some eternity ago. + zarzycki@ simply modified it a bit to fit within the launchd(8) event loop. + Plan on taking the current init.c from the FreeBSD source tree and modifying + it accordingly. + + o FEATURE DROP: + - Xml configuration files (for now, or until I think of a better format) + - LowPriorityIO as a job option. ==== //depot/projects/soc2005/launchd/includes/launch.h#3 (text+ko) ==== @@ -53,7 +53,12 @@ #include #include +/* Keep Mac OS/Darwin specific code in for reference purposes, but don't build it */ +#if defined(__APPLE__) && defined(__MACH__) +#define _BUILD_DARWIN_ +#endif + #define LAUNCH_KEY_SUBMITJOB "SubmitJob" #define LAUNCH_KEY_REMOVEJOB "RemoveJob" #define LAUNCH_KEY_STARTJOB "StartJob" @@ -84,7 +89,10 @@ #define LAUNCH_JOBKEY_PID "PID" #define LAUNCH_JOBKEY_UMASK "Umask" #define LAUNCH_JOBKEY_NICE "Nice" +// FreeBSD's sysctl() interface doesn't allow per-process attributes :/ +#ifdef _BUILD_DARWIN_ #define LAUNCH_JOBKEY_LOWPRIORITYIO "LowPriorityIO" +#endif #define LAUNCH_JOBKEY_SESSIONCREATE "SessionCreate" #define LAUNCH_JOBKEY_SOFTRESOURCELIMITS "SoftResourceLimits" #define LAUNCH_JOBKEY_HARDRESOURCELIMITS "HardResourceLimits" ==== //depot/projects/soc2005/launchd/includes/launchd.h#4 (text+ko) ==== @@ -23,14 +23,13 @@ #ifndef __LAUNCHD_H__ #define __LAUNCHD_H__ +#include #include +#include typedef void (*kq_callback)(void *, struct kevent *); extern kq_callback kqsimple_zombie_reaper; -#ifdef _BUILD_MACOS -extern mach_port_t launchd_bootstrap_port; -#endif extern sigset_t blocked_signals; #ifdef PID1_REAP_ADOPTED_CHILDREN @@ -38,7 +37,6 @@ #endif int kevent_mod(uintptr_t ident, short filter, u_short flags, u_int fflags, intptr_t data, void *udata); -void launchd_SessionCreate(const char *who); void init_boot(bool sflag, bool vflag, bool xflag); void init_pre_kevent(void); @@ -48,9 +46,33 @@ void catatonia(void); void death(void); +#ifdef _BUILD_DARWIN_ +extern mach_port_t launchd_bootstrap_port; +void launchd_SessionCreate(const char *who); +#endif + +#ifndef _BUILD_DARWIN_ // on Darwin-based systems, LOG_LAUNCHD is defined for syslog() -#ifndef _BUILD_MACOS #define LOG_LAUNCHD LOG_DAEMON + +/* on Darwin-based systems, O_EVTONLY helps us track changes to a certain file descriptor + * as outlined here: + * http://developer.apple.com/documentation/Performance/Conceptual/FileSystem/Articles/TrackingChanges.html#//apple_ref/doc/uid/20001993-118158 + * + * on FreeBSD, specifically, EVFILT_VNODE is the closest thing to what we want to do + */ +#define O_EVTONLY EVFILT_VNODE + +/* these are defined in sys/event.h in the Darwin source tree, for now we'll + * define them here (disgusting, but we'll see how it works out. + * + * XXX: this may break something ;) + */ +#define NOTE_SECONDS 0x00000001 /* data is seconds */ +#define NOTE_USECONDS 0x00000002 /* data is microseconds */ +#define NOTE_NSECONDS 0x00000004 /* data is nanoseconds */ +#define NOTE_ABSOLUTE 0x00000008 /* absolute timeout */ #endif + #endif ==== //depot/projects/soc2005/launchd/launchd.c#4 (text+ko) ==== @@ -48,14 +48,16 @@ * @APPLE_LICENSE_HEADER_END@ */ -#ifdef _BUILD_MACOS +#ifdef _BUILD_DARWIN_ #include #include #include + #ifdef EVFILT_MACH_IMPLEMENTED #include #include #endif + #endif #include @@ -100,7 +102,7 @@ #include "launch_priv.h" #include "launchd.h" -#ifdef _BUILD_MACOS +#ifdef _BUILD_DARWIN_ #include "bootstrap_internal.h" #endif @@ -111,7 +113,7 @@ #define LAUNCHD_CONF ".launchd.conf" #define LAUNCHCTL_PATH "/sbin/launchctl" -#ifdef _BUILD_MACOS +#ifdef _BUILD_DARWIN_ #define SECURITY_LIB "/System/Library/Frameworks/Security.framework/Versions/A/Security" #define VOLFSDIR "/.vol" #endif @@ -198,17 +200,10 @@ static void launchd_server_init(bool create_session); static void conceive_firstborn(char *argv[]); -#ifdef EVFILT_MACH_IMPLEMENTED -static void *mach_demand_loop(void *); -static void mach_callback(void *, struct kevent *); -static kq_callback kqmach_callback = mach_callback; -#endif - static void usage(FILE *where); static int _fd(int fd); static void loopback_setup(void); -static void workaround3048875(int argc, char *argv[]); static void reload_launchd_config(void); static int dir_has_files(const char *path); static void setup_job_env(launch_data_t obj, const char *key, void *context); @@ -222,7 +217,17 @@ sigset_t blocked_signals; -#ifdef _BUILD_MACOS +#ifdef _BUILD_DARWIN_ + +#ifdef EVFILT_MACH_IMPLEMENTED +static void *mach_demand_loop(void *); +static void mach_callback(void *, struct kevent *); +static kq_callback kqmach_callback = mach_callback; +#endif + +// workaround for an OpenFirmware and Xnu bug, only on Darwin though ;) +static void workaround3048875(int argc, char *argv[]); + static pthread_t mach_server_loop_thread; mach_port_t launchd_bootstrap_port = MACH_PORT_NULL; blocked_signals = 0; @@ -256,8 +261,11 @@ bool sflag = false, xflag = false, vflag = false, dflag = false; int ch; +// workaround for that nasty OpenFirmware bug, zoinks! +#ifdef _BUILD_DARWIN_ if (getpid() == 1) workaround3048875(argc, argv); +#endif setegid(getgid()); seteuid(getuid()); @@ -319,7 +327,7 @@ if (getpid() == 1) { pid1_magic_init(sflag, vflag, xflag); } else { -#ifdef _BUILD_MACOS +#ifdef _BUILD_DARWIN_ launchd_bootstrap_port = bootstrap_port; #endif launchd_server_init(argv[0] ? true : false); @@ -383,8 +391,10 @@ uint64_t mem = 0; uint32_t mvn; size_t memsz = sizeof(mem); +#ifdef _BUILD_DARWIN_ int pthr_r; - +#endif + setpriority(PRIO_PROCESS, 0, -1); if (setsid() == -1) @@ -426,7 +436,7 @@ syslog(LOG_ERR, "mount(\"%s\", \"%s\", ...): %m", "fdesc", "/dev/"); setenv("PATH", _PATH_STDPATH, 1); -#ifdef _BUILD_MACOS +#ifdef _BUILD_DARWIN_ launchd_bootstrap_port = mach_init_init(); task_set_bootstrap_port(mach_task_self(), launchd_bootstrap_port); bootstrap_port = MACH_PORT_NULL; @@ -434,7 +444,7 @@ pthread_attr_init(&attr); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); -#ifdef _BUILD_MACOS +#ifdef _BUILD_DARWIN_ pthr_r = pthread_create(&mach_server_loop_thread, &attr, mach_server_loop, NULL); if (pthr_r != 0) { syslog(LOG_ERR, "pthread_create(mach_server_loop): %s", strerror(pthr_r)); @@ -1616,8 +1626,12 @@ socketpair(AF_UNIX, SOCK_STREAM, 0, execspair); time(&j->start_time); - +#ifdef _BUILD_DARWIN_ + // This function can be found in the vendor source in bootstrap.c switch (c = fork_with_bootstrap_port(launchd_bootstrap_port)) { +#else + switch (c = fork()) { +#endif case -1: job_log_error(j, LOG_ERR, "fork() failed, will try again in one second"); close(execspair[0]); @@ -1707,7 +1721,9 @@ { launch_data_t srl = launch_data_dict_lookup(j->ldj, LAUNCH_JOBKEY_SOFTRESOURCELIMITS); launch_data_t hrl = launch_data_dict_lookup(j->ldj, LAUNCH_JOBKEY_HARDRESOURCELIMITS); +#ifdef _BUILD_DARWIN_ bool inetcompat = job_get_bool(j->ldj, LAUNCH_JOBKEY_INETDCOMPATIBILITY); +#endif launch_data_t tmp; size_t i; const char *tmpstr; @@ -1749,9 +1765,12 @@ } } +#ifdef _BUILD_DARWIN_ if (!inetcompat && job_get_bool(j->ldj, LAUNCH_JOBKEY_SESSIONCREATE)) launchd_SessionCreate(job_get_file2exec(j->ldj)); + // sysctl(2) in FreeBSD doesn't have a comprable option for changing the + // I/O priority on a specific process :-/ if (job_get_bool(j->ldj, LAUNCH_JOBKEY_LOWPRIORITYIO)) { int lowprimib[] = { CTL_KERN, KERN_PROC_LOW_PRI_IO }; int val = 1; @@ -1759,6 +1778,8 @@ if (sysctl(lowprimib, sizeof(lowprimib) / sizeof(lowprimib[0]), NULL, NULL, &val, sizeof(val)) == -1) job_log_error(j, LOG_WARNING, "sysctl(\"%s\")", "kern.proc_low_pri_io"); } +#endif + if ((tmpstr = job_get_string(j->ldj, LAUNCH_JOBKEY_ROOTDIRECTORY))) { chroot(tmpstr); chdir("."); @@ -1861,7 +1882,10 @@ if (getpid() == 1) { catatonia(); +#ifdef _BUILD_DARWIN_ + /* defined in bootstrap.h for building on Mac OS 10.xx systems */ mach_start_shutdown(SIGTERM); +#endif } } @@ -1913,6 +1937,7 @@ } } +#ifdef _BUILD_DARWIN_ if (!mounted_volfs) { int r = mount("volfs", VOLFSDIR, MNT_RDONLY, NULL); @@ -1927,6 +1952,7 @@ mounted_volfs = true; } } +#endif if (!launchd_inited) launchd_server_init(false); @@ -2047,7 +2073,11 @@ if (lstat(ldconf, &sb) == 0) { int spair[2]; socketpair(AF_UNIX, SOCK_STREAM, 0, spair); +#ifdef _BUILD_DARWIN_ readcfg_pid = fork_with_bootstrap_port(launchd_bootstrap_port); +#else + readcfg_pid = fork(); +#endif if (readcfg_pid == 0) { char nbuf[100]; close(spair[0]); @@ -2165,7 +2195,11 @@ close(s); close(s6); } - +/* + * This workaround fixes a bug or two cause because the Xnu kernel wasn't + * passing boot-args from OFW to PID 1 correctly, yikes! + */ +#ifdef _BUILD_DARWIN_ static void workaround3048875(int argc, char *argv[]) { int i; @@ -2189,6 +2223,7 @@ execv(newargv[0], newargv); } +#endif static launch_data_t adjust_rlimits(launch_data_t in) { @@ -2257,9 +2292,13 @@ } /* - * XXX: I'm not exactly sure what this function's exact purpose is. + * I believe this function opens an interface to the Security.framework which + * allows verification against keychains, etc. + * http://developer.apple.com/documentation/Darwin/Reference/ManPages/man1/security.1.html + * + * This is here because of the securityd team at Apple Inc.....i.e. we don't really need it ;) */ -#ifdef _BUILD_MACOS +#ifdef _BUILD_DARWIN_ __private_extern__ void launchd_SessionCreate(const char *who) { void *seclib = dlopen(SECURITY_LIB, RTLD_LAZY); From owner-p4-projects@FreeBSD.ORG Fri Jul 15 18:19:00 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CA6716A421; Fri, 15 Jul 2005 18:19:00 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DEB2816A41C for ; Fri, 15 Jul 2005 18:18:59 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C42A43D46 for ; Fri, 15 Jul 2005 18:18:59 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6FIIxwc019329 for ; Fri, 15 Jul 2005 18:18:59 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6FIIxIw019326 for perforce@freebsd.org; Fri, 15 Jul 2005 18:18:59 GMT (envelope-from jhb@freebsd.org) Date: Fri, 15 Jul 2005 18:18:59 GMT Message-Id: <200507151818.j6FIIxIw019326@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 80290 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2005 18:19:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=80290 Change 80290 by jhb@jhb_slimer on 2005/07/15 18:18:51 Update. Affected files ... .. //depot/projects/smpng/sys/notes#49 edit Differences ... ==== //depot/projects/smpng/sys/notes#49 (text+ko) ==== @@ -37,8 +37,8 @@ - sparc64 - sys + start over saving current state in the ktrace branch so I can break this up - - change atomic_ptr() to use uintptr_t and change sparc64 and arm to treat - memory modified in _swp and casa as input and output + - change sparc64 and arm to treat memory modified in _swp and casa as + input and output - implement - test - commit From owner-p4-projects@FreeBSD.ORG Fri Jul 15 21:42:56 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D82216A420; Fri, 15 Jul 2005 21:42:55 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5BF5016A41C for ; Fri, 15 Jul 2005 21:42:55 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B59143D49 for ; Fri, 15 Jul 2005 21:42:55 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6FLgtjn035072 for ; Fri, 15 Jul 2005 21:42:55 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6FLgsYf035067 for perforce@freebsd.org; Fri, 15 Jul 2005 21:42:54 GMT (envelope-from sam@freebsd.org) Date: Fri, 15 Jul 2005 21:42:54 GMT Message-Id: <200507152142.j6FLgsYf035067@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 80299 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2005 21:42:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=80299 Change 80299 by sam@sam_ebb on 2005/07/15 21:42:34 Bring in non-vap changes from vap work: o redo channel handling o change fixed rate from index to ieee rate code so it's mode-independent Also prepare ath for new hal. Affected files ... .. //depot/projects/wifi/sys/dev/ath/ath_rate/amrr/amrr.c#13 edit .. //depot/projects/wifi/sys/dev/ath/ath_rate/onoe/onoe.c#13 edit .. //depot/projects/wifi/sys/dev/ath/ath_rate/sample/sample.c#5 edit .. //depot/projects/wifi/sys/dev/ath/if_ath.c#86 edit .. //depot/projects/wifi/sys/dev/ath/if_athvar.h#36 edit .. //depot/projects/wifi/sys/dev/awi/awi.c#9 edit .. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#5 edit .. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#7 edit .. //depot/projects/wifi/sys/dev/ral/if_ral.c#4 edit .. //depot/projects/wifi/sys/dev/usb/if_ural.c#4 edit .. //depot/projects/wifi/sys/dev/wi/if_wi.c#17 edit .. //depot/projects/wifi/sys/net80211/_ieee80211.h#6 edit .. //depot/projects/wifi/sys/net80211/ieee80211.c#23 edit .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#52 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#39 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#53 edit .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#43 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#27 edit .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#27 edit Differences ... ==== //depot/projects/wifi/sys/dev/ath/ath_rate/amrr/amrr.c#13 (text+ko) ==== @@ -284,7 +284,7 @@ int srate; KASSERT(ni->ni_rates.rs_nrates > 0, ("no rates")); - if (ic->ic_fixed_rate == -1) { + if (ic->ic_fixed_rate == IEEE80211_FIXED_RATE_NONE) { /* * No fixed rate is requested. For 11b start with * the highest negotiated rate; otherwise, for 11g @@ -303,18 +303,15 @@ } } else { /* - * A fixed rate is to be used; ic_fixed_rate is an - * index into the supported rate set. Convert this + * A fixed rate is to be used; ic_fixed_rate is the + * IEEE code for this rate (sans basic bit). Convert this * to the index into the negotiated rate set for * the node. We know the rate is there because the * rate set is checked when the station associates. */ - const struct ieee80211_rateset *rs = - &ic->ic_sup_rates[ic->ic_curmode]; - int r = rs->rs_rates[ic->ic_fixed_rate] & IEEE80211_RATE_VAL; /* NB: the rate set is assumed sorted */ srate = ni->ni_rates.rs_nrates - 1; - for (; srate >= 0 && RATE(srate) != r; srate--) + for (; srate >= 0 && RATE(srate) != ic->ic_fixed_rate; srate--) ; KASSERT(srate >= 0, ("fixed rate %d not in rate set", ic->ic_fixed_rate)); @@ -366,7 +363,8 @@ ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_cb, sc); ath_rate_update(sc, ic->ic_bss, 0); } - if (ic->ic_fixed_rate == -1 && state == IEEE80211_S_RUN) { + if (ic->ic_fixed_rate == IEEE80211_FIXED_RATE_NONE && + state == IEEE80211_S_RUN) { int interval; /* * Start the background rate control thread if we ==== //depot/projects/wifi/sys/dev/ath/ath_rate/onoe/onoe.c#13 (text+ko) ==== @@ -268,7 +268,7 @@ int srate; KASSERT(ni->ni_rates.rs_nrates > 0, ("no rates")); - if (ic->ic_fixed_rate == -1) { + if (ic->ic_fixed_rate == IEEE80211_FIXED_RATE_NONE) { /* * No fixed rate is requested. For 11b start with * the highest negotiated rate; otherwise, for 11g @@ -287,18 +287,15 @@ } } else { /* - * A fixed rate is to be used; ic_fixed_rate is an - * index into the supported rate set. Convert this + * A fixed rate is to be used; ic_fixed_rate is the + * IEEE code for this rate (sans basic bit). Convert this * to the index into the negotiated rate set for * the node. We know the rate is there because the * rate set is checked when the station associates. */ - const struct ieee80211_rateset *rs = - &ic->ic_sup_rates[ic->ic_curmode]; - int r = rs->rs_rates[ic->ic_fixed_rate] & IEEE80211_RATE_VAL; /* NB: the rate set is assumed sorted */ srate = ni->ni_rates.rs_nrates - 1; - for (; srate >= 0 && RATE(srate) != r; srate--) + for (; srate >= 0 && RATE(srate) != ic->ic_fixed_rate; srate--) ; KASSERT(srate >= 0, ("fixed rate %d not in rate set", ic->ic_fixed_rate)); @@ -350,7 +347,8 @@ ieee80211_iterate_nodes(&ic->ic_sta, ath_rate_cb, sc); ath_rate_update(sc, ic->ic_bss, 0); } - if (ic->ic_fixed_rate == -1 && state == IEEE80211_S_RUN) { + if (ic->ic_fixed_rate == IEEE80211_FIXED_RATE_NONE && + state == IEEE80211_S_RUN) { int interval; /* * Start the background rate control thread if we ==== //depot/projects/wifi/sys/dev/ath/ath_rate/sample/sample.c#5 (text+ko) ==== @@ -685,20 +685,17 @@ KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode)); sn->static_rate_ndx = -1; - if (ic->ic_fixed_rate != -1) { + if (ic->ic_fixed_rate != IEEE80211_FIXED_RATE_NONE) { /* - * A fixed rate is to be used; ic_fixed_rate is an - * index into the supported rate set. Convert this + * A fixed rate is to be used; ic_fixed_rate is the + * IEEE code for this rate (sans basic bit). Convert this * to the index into the negotiated rate set for * the node. We know the rate is there because the * rate set is checked when the station associates. */ - const struct ieee80211_rateset *rs = - &ic->ic_sup_rates[ic->ic_curmode]; - int r = rs->rs_rates[ic->ic_fixed_rate] & IEEE80211_RATE_VAL; /* NB: the rate set is assumed sorted */ srate = ni->ni_rates.rs_nrates - 1; - for (; srate >= 0 && RATE(srate) != r; srate--) + for (; srate >= 0 && RATE(srate) != ic->ic_fixed_rate; srate--) ; KASSERT(srate >= 0, ("fixed rate %d not in rate set", ic->ic_fixed_rate)); ==== //depot/projects/wifi/sys/dev/ath/if_ath.c#86 (text+ko) ==== @@ -785,8 +785,7 @@ * Let the hal handle the event. We assume it will * clear whatever condition caused the interrupt. */ - ath_hal_mibevent(ah, - &ATH_NODE(sc->sc_ic.ic_bss)->an_halstats); + ath_hal_mibevent(ah, &sc->sc_halstats); ath_hal_intrset(ah, sc->sc_imask); } } @@ -835,7 +834,7 @@ } static u_int -ath_chan2flags(struct ieee80211com *ic, struct ieee80211_channel *chan) +ath_chan2flags(struct ieee80211_channel *chan) { #define N(a) (sizeof(a) / sizeof(a[0])) static const u_int modeflags[] = { @@ -847,7 +846,7 @@ CHANNEL_T, /* IEEE80211_MODE_TURBO_A */ CHANNEL_108G /* IEEE80211_MODE_TURBO_G */ }; - enum ieee80211_phymode mode = ieee80211_chan2mode(ic, chan); + enum ieee80211_phymode mode = ieee80211_chan2mode(chan); KASSERT(mode < N(modeflags), ("unexpected phy mode %u", mode)); KASSERT(modeflags[mode] != 0, ("mode %u undefined", mode)); @@ -861,7 +860,6 @@ struct ath_softc *sc = (struct ath_softc *) arg; struct ieee80211com *ic = &sc->sc_ic; struct ifnet *ifp = sc->sc_ifp; - struct ieee80211_node *ni; struct ath_hal *ah = sc->sc_ah; HAL_STATUS status; @@ -882,8 +880,8 @@ * be followed by initialization of the appropriate bits * and then setup of the interrupt mask. */ - sc->sc_curchan.channel = ic->ic_ibss_chan->ic_freq; - sc->sc_curchan.channelFlags = ath_chan2flags(ic, ic->ic_ibss_chan); + sc->sc_curchan.channel = ic->ic_curchan->ic_freq; + sc->sc_curchan.channelFlags = ath_chan2flags(ic->ic_curchan); if (!ath_hal_reset(ah, ic->ic_opmode, &sc->sc_curchan, AH_FALSE, &status)) { if_printf(ifp, "unable to reset hardware; hal status %u\n", status); @@ -930,9 +928,7 @@ * to kick the 802.11 state machine as it's likely to * immediately call back to us to send mgmt frames. */ - ni = ic->ic_bss; - ni->ni_chan = ic->ic_ibss_chan; - ath_chan_change(sc, ni->ni_chan); + ath_chan_change(sc, ic->ic_curchan); if (ic->ic_opmode != IEEE80211_M_MONITOR) { if (ic->ic_roaming != IEEE80211_ROAMING_MANUAL) ieee80211_new_state(ic, IEEE80211_S_SCAN, -1); @@ -1009,7 +1005,7 @@ * (and system). This varies by chip and is mostly an * issue with newer parts that go to sleep more quickly. */ - ath_hal_setpower(sc->sc_ah, HAL_PM_FULL_SLEEP, 0); + ath_hal_setpower(sc->sc_ah, HAL_PM_FULL_SLEEP); } ATH_UNLOCK(sc); } @@ -1034,9 +1030,9 @@ * Convert to a HAL channel description with the flags * constrained to reflect the current operating mode. */ - c = ic->ic_ibss_chan; + c = ic->ic_curchan; sc->sc_curchan.channel = c->ic_freq; - sc->sc_curchan.channelFlags = ath_chan2flags(ic, c); + sc->sc_curchan.channelFlags = ath_chan2flags(c); ath_hal_intrset(ah, 0); /* disable interrupts */ ath_draintxq(sc); /* stop xmit side */ @@ -3278,7 +3274,7 @@ } while (ath_rxbuf_init(sc, bf) == 0); /* rx signal state monitoring */ - ath_hal_rxmonitor(ah, &ATH_NODE(ic->ic_bss)->an_halstats); + ath_hal_rxmonitor(ah, &sc->sc_halstats, &sc->sc_curchan); NET_UNLOCK_GIANT(); /* XXX */ #undef PA2DESC @@ -4394,7 +4390,6 @@ static void ath_chan_change(struct ath_softc *sc, struct ieee80211_channel *chan) { - struct ieee80211com *ic = &sc->sc_ic; enum ieee80211_phymode mode; u_int16_t flags; @@ -4402,7 +4397,7 @@ * Change channels and update the h/w rate map * if we're switching; e.g. 11a to 11b/g. */ - mode = ieee80211_chan2mode(ic, chan); + mode = ieee80211_chan2mode(chan); if (mode != sc->sc_curmode) ath_setcurmode(sc, mode); /* @@ -4411,13 +4406,11 @@ */ if (IEEE80211_IS_CHAN_A(chan)) flags = IEEE80211_CHAN_A; - /* XXX 11g schizophrenia */ - else if (IEEE80211_IS_CHAN_G(chan) || - IEEE80211_IS_CHAN_PUREG(chan)) + else if (IEEE80211_IS_CHAN_ANYG(chan)) flags = IEEE80211_CHAN_G; else flags = IEEE80211_CHAN_B; - if (IEEE80211_IS_CHAN_T(chan)) + if (IEEE80211_IS_CHAN_TURBO(chan)) flags |= IEEE80211_CHAN_TURBO; sc->sc_tx_th.wt_chan_freq = sc->sc_rx_th.wr_chan_freq = htole16(chan->ic_freq); @@ -4444,14 +4437,15 @@ * operating mode. */ hchan.channel = chan->ic_freq; - hchan.channelFlags = ath_chan2flags(ic, chan); + hchan.channelFlags = ath_chan2flags(chan); DPRINTF(sc, ATH_DEBUG_RESET, "%s: %u (%u MHz) -> %u (%u MHz)\n", __func__, - ath_hal_mhz2ieee(sc->sc_curchan.channel, + ath_hal_mhz2ieee(ah, sc->sc_curchan.channel, sc->sc_curchan.channelFlags), sc->sc_curchan.channel, - ath_hal_mhz2ieee(hchan.channel, hchan.channelFlags), hchan.channel); + ath_hal_mhz2ieee(ah, hchan.channel, hchan.channelFlags), + hchan.channel); if (hchan.channel != sc->sc_curchan.channel || hchan.channelFlags != sc->sc_curchan.channelFlags) { HAL_STATUS status; @@ -4487,7 +4481,6 @@ * Change channels and update the h/w rate map * if we're switching; e.g. 11a to 11b/g. */ - ic->ic_ibss_chan = chan; ath_chan_change(sc, chan); /* @@ -4579,7 +4572,7 @@ goto done; } ni = ic->ic_bss; - error = ath_chan_set(sc, ni->ni_chan); + error = ath_chan_set(sc, ic->ic_curchan); if (error != 0) goto bad; rfilt = ath_calcrxfilter(sc, nstate); @@ -4618,7 +4611,7 @@ , ni->ni_intval , ether_sprintf(ni->ni_bssid) , ni->ni_capinfo - , ieee80211_chan2ieee(ic, ni->ni_chan)); + , ieee80211_chan2ieee(ic, ic->ic_curchan)); switch (ic->ic_opmode) { case IEEE80211_M_HOSTAP: @@ -4655,6 +4648,13 @@ * Configure the beacon and sleep timers. */ ath_beacon_config(sc); + + /* + * Reset rssi stats; maybe not the best place... + */ + sc->sc_halstats.ns_avgbrssi = ATH_RSSI_DUMMY_MARKER; + sc->sc_halstats.ns_avgrssi = ATH_RSSI_DUMMY_MARKER; + sc->sc_halstats.ns_avgtxrssi = ATH_RSSI_DUMMY_MARKER; } else { ath_hal_intrset(ah, sc->sc_imask &~ (HAL_INT_SWBA | HAL_INT_BMISS)); @@ -4739,7 +4739,7 @@ struct ifnet *ifp = sc->sc_ifp; struct ath_hal *ah = sc->sc_ah; HAL_CHANNEL *chans; - int i, ix, nchan; + int i, nchan; chans = malloc(IEEE80211_CHAN_MAX * sizeof(HAL_CHANNEL), M_TEMP, M_NOWAIT); @@ -4748,6 +4748,7 @@ return ENOMEM; } if (!ath_hal_init_channels(ah, chans, IEEE80211_CHAN_MAX, &nchan, + NULL, 0, NULL, cc, HAL_MODE_ALL, outdoor, xchanmode)) { u_int32_t rd; @@ -4759,26 +4760,20 @@ } /* - * Convert HAL channels to ieee80211 ones and insert - * them in the table according to their channel number. + * Convert HAL channels to ieee80211 ones. */ for (i = 0; i < nchan; i++) { HAL_CHANNEL *c = &chans[i]; - ix = ath_hal_mhz2ieee(c->channel, c->channelFlags); - if (ix > IEEE80211_CHAN_MAX) { - if_printf(ifp, "bad hal channel %u (%u/%x) ignored\n", - ix, c->channel, c->channelFlags); - continue; - } - /* NB: flags are known to be compatible */ - if (ic->ic_channels[ix].ic_freq == 0) { - ic->ic_channels[ix].ic_freq = c->channel; - ic->ic_channels[ix].ic_flags = c->channelFlags; - } else { - /* channels overlap; e.g. 11g and 11b */ - ic->ic_channels[ix].ic_flags |= c->channelFlags; - } + struct ieee80211_channel *ichan = &ic->ic_channels[i]; + + ichan->ic_ieee = ath_hal_mhz2ieee(ah, c->channel, c->channelFlags); + ichan->ic_freq = c->channel; + ichan->ic_flags = c->channelFlags; + ichan->ic_maxregpower = c->maxRegTxPower; /* dBm */ + ichan->ic_maxpower = c->maxTxPower / 4; /* 1/4 dBm */ + ichan->ic_minpower = c->minTxPower / 4; /* 1/4 dBm */ } + ic->ic_nchans = nchan; free(chans, M_TEMP); return 0; } ==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#36 (text+ko) ==== @@ -310,6 +310,7 @@ struct callout sc_cal_ch; /* callout handle for cals */ struct callout sc_scan_ch; /* callout handle for scan */ + HAL_NODE_STATS sc_halstats; /* station-mode rssi stats */ }; #define sc_tx_th u_tx_rt.th #define sc_rx_th u_rx_rt.th @@ -363,8 +364,8 @@ ((*(_ah)->ah_getPendingInterrupts)((_ah), (_pmask))) #define ath_hal_updatetxtriglevel(_ah, _inc) \ ((*(_ah)->ah_updateTxTrigLevel)((_ah), (_inc))) -#define ath_hal_setpower(_ah, _mode, _sleepduration) \ - ((*(_ah)->ah_setPowerMode)((_ah), (_mode), AH_TRUE, (_sleepduration))) +#define ath_hal_setpower(_ah, _mode) \ + ((*(_ah)->ah_setPowerMode)((_ah), (_mode), AH_TRUE)) #define ath_hal_keycachesize(_ah) \ ((*(_ah)->ah_getKeyCacheSize)((_ah))) #define ath_hal_keyreset(_ah, _ix) \ @@ -448,8 +449,8 @@ ((*(_ah)->ah_getDefAntenna)((_ah))) #define ath_hal_setdefantenna(_ah, _ant) \ ((*(_ah)->ah_setDefAntenna)((_ah), (_ant))) -#define ath_hal_rxmonitor(_ah, _arg) \ - ((*(_ah)->ah_rxMonitor)((_ah), (_arg))) +#define ath_hal_rxmonitor(_ah, _arg, _chan) \ + ((*(_ah)->ah_rxMonitor)((_ah), (_arg), (_chan))) #define ath_hal_mibevent(_ah, _stats) \ ((*(_ah)->ah_procMibEvent)((_ah), (_stats))) #define ath_hal_setslottime(_ah, _us) \ @@ -532,7 +533,7 @@ _rtsrate, _rtsdura) \ ((*(_ah)->ah_setupTxDesc)((_ah), (_ds), (_plen), (_hlen), (_atype), \ (_txpow), (_txr0), (_txtr0), (_keyix), (_ant), \ - (_flags), (_rtsrate), (_rtsdura))) + (_flags), (_rtsrate), (_rtsdura), 0, 0, 0)) #define ath_hal_setupxtxdesc(_ah, _ds, \ _txr1, _txtr1, _txr2, _txtr2, _txr3, _txtr3) \ ((*(_ah)->ah_setupXTxDesc)((_ah), (_ds), \ ==== //depot/projects/wifi/sys/dev/awi/awi.c#9 (text+ko) ==== @@ -605,8 +605,8 @@ rs = &ic->ic_sup_rates[IEEE80211_MODE_FH]; else rs = &ic->ic_sup_rates[IEEE80211_MODE_11B]; - if (ic->ic_fixed_rate != -1) { - rate = rs->rs_rates[ic->ic_fixed_rate] & IEEE80211_RATE_VAL; + if (ic->ic_fixed_rate != IEEE80211_FIXED_RATE_NONE) { + rate = ic->ic_fixed_rate; } else { rate = 0; for (i = 0; i < rs->rs_nrates; i++) { @@ -1016,6 +1016,7 @@ ime = ic->ic_media.ifm_cur; if (IFM_SUBTYPE(ime->ifm_media) == IFM_AUTO) { i = -1; + rate = ic->ic_fixed_rate; } else { struct ieee80211_rateset *rs = &ic->ic_sup_rates[(ic->ic_phytype == IEEE80211_T_FH) @@ -1030,8 +1031,8 @@ if (i == rs->rs_nrates) return EINVAL; } - if (ic->ic_fixed_rate != i) { - ic->ic_fixed_rate = i; + if (ic->ic_fixed_rate != rate) { + ic->ic_fixed_rate = rate; error = ENETRESET; } @@ -1095,11 +1096,10 @@ rate = ic->ic_bss->ni_rates.rs_rates[ic->ic_bss->ni_txrate] & IEEE80211_RATE_VAL; } else { - if (ic->ic_fixed_rate == -1) + if (ic->ic_fixed_rate == IEEE80211_FIXED_RATE_NONE) rate = 0; else - rate = ic->ic_sup_rates[mode]. - rs_rates[ic->ic_fixed_rate] & IEEE80211_RATE_VAL; + rate = ic->ic_fixed_rate; } imr->ifm_active |= ieee80211_rate2media(ic, rate, mode); switch (ic->ic_opmode) { ==== //depot/projects/wifi/sys/dev/ipw/if_ipw.c#5 (text+ko) ==== @@ -216,6 +216,7 @@ struct ipw_softc *sc = device_get_softc(dev); struct ifnet *ifp; struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211_channel *c; uint16_t val; int error, i; @@ -311,9 +312,10 @@ val <<= 1; for (i = 1; i < 16; i++) { if (val & (1 << i)) { - ic->ic_channels[i].ic_freq = - ieee80211_ieee2mhz(i, IEEE80211_CHAN_B); - ic->ic_channels[i].ic_flags = IEEE80211_CHAN_B; + c = &ic->ic_channels[ic->ic_nchans++]; + c->ic_freq = ieee80211_ieee2mhz(i, IEEE80211_CHAN_2GHZ); + c->ic_flags = IEEE80211_CHAN_B; + c->ic_ieee = i; } } @@ -1003,7 +1005,9 @@ #if IEEE80211_CHAN_MAX < 255 if (frm[2] <= IEEE80211_CHAN_MAX) #endif - ic->ic_bss->ni_chan = &ic->ic_channels[frm[2]]; + ic->ic_bsschan = ieee80211_find_channel(ic, + ieee80211_ieee2mhz(frm[2], 0), + IEEE80211_MODE_AUTO); frm += frm[1] + 2; } @@ -1038,8 +1042,8 @@ tap->wr_flags = 0; tap->wr_antsignal = status->rssi; - tap->wr_chan_freq = htole16(ic->ic_ibss_chan->ic_freq); - tap->wr_chan_flags = htole16(ic->ic_ibss_chan->ic_flags); + tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq); + tap->wr_chan_flags = htole16(ic->ic_curchan->ic_flags); bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_rxtap_len, m); } @@ -1335,8 +1339,8 @@ struct ipw_tx_radiotap_header *tap = &sc->sc_txtap; tap->wt_flags = 0; - tap->wt_chan_freq = htole16(ic->ic_ibss_chan->ic_freq); - tap->wt_chan_flags = htole16(ic->ic_ibss_chan->ic_flags); + tap->wt_chan_freq = htole16(ic->ic_curchan->ic_freq); + tap->wt_chan_flags = htole16(ic->ic_curchan->ic_flags); bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); } @@ -1851,7 +1855,7 @@ if (ic->ic_opmode == IEEE80211_M_IBSS || ic->ic_opmode == IEEE80211_M_MONITOR) { - data = htole32(ieee80211_chan2ieee(ic, ic->ic_ibss_chan)); + data = htole32(ieee80211_chan2ieee(ic, ic->ic_curchan)); DPRINTF(("Setting channel to %u\n", le32toh(data))); error = ipw_cmd(sc, IPW_CMD_SET_CHANNEL, &data, sizeof data); if (error != 0) ==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#7 (text+ko) ==== @@ -229,6 +229,7 @@ struct iwi_softc *sc = device_get_softc(dev); struct ifnet *ifp; struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211_channel *c; uint16_t val; int error, i; @@ -352,11 +353,12 @@ /* set supported .11b and .11g channels (1 through 14) */ for (i = 1; i <= 14; i++) { - ic->ic_channels[i].ic_freq = - ieee80211_ieee2mhz(i, IEEE80211_CHAN_2GHZ); - ic->ic_channels[i].ic_flags = + c = &ic->ic_channels[ic->ic_nchans++]; + c->ic_freq = ieee80211_ieee2mhz(i, IEEE80211_CHAN_2GHZ); + c->ic_flags = IEEE80211_CHAN_CCK | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_DYN | IEEE80211_CHAN_2GHZ; + c->ic_ieee = i; } ieee80211_ifattach(ic); @@ -906,7 +908,7 @@ if (ic->ic_opmode == IEEE80211_M_IBSS) ieee80211_new_state(ic, IEEE80211_S_AUTH, -1); else if (ic->ic_opmode == IEEE80211_M_MONITOR) - iwi_set_chan(sc, ic->ic_ibss_chan); + iwi_set_chan(sc, ic->ic_curchan); return sc->sc_newstate(ic, nstate, IEEE80211_FC0_SUBTYPE_ASSOC_RESP); @@ -1009,7 +1011,9 @@ #if IEEE80211_CHAN_MAX < 255 if (frm[2] <= IEEE80211_CHAN_MAX) #endif - ic->ic_bss->ni_chan = &ic->ic_channels[frm[2]]; + ic->ic_bsschan = ieee80211_find_channel(ic, + ieee80211_ieee2mhz(frm[2], 0), + IEEE80211_MODE_AUTO); frm += frm[1] + 2; } @@ -1050,10 +1054,9 @@ tap->wr_flags = 0; tap->wr_rate = frame->rate; - tap->wr_chan_freq = - htole16(ic->ic_channels[frame->chan].ic_freq); - tap->wr_chan_flags = - htole16(ic->ic_channels[frame->chan].ic_flags); + /* XXX take from frame */ + tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq); + tap->wr_chan_flags = htole16(ic->ic_curchan->ic_flags); tap->wr_antsignal = frame->signal; tap->wr_antenna = frame->antenna; @@ -1115,7 +1118,7 @@ sc->flags &= ~IWI_FLAG_SCANNING; ieee80211_end_scan(ic); } else - iwi_set_chan(sc, ic->ic_ibss_chan); + iwi_set_chan(sc, ic->ic_curchan); break; case IWI_NOTIF_TYPE_AUTHENTICATION: @@ -1354,8 +1357,8 @@ struct iwi_tx_radiotap_header *tap = &sc->sc_txtap; tap->wt_flags = 0; - tap->wt_chan_freq = htole16(ic->ic_ibss_chan->ic_freq); - tap->wt_chan_flags = htole16(ic->ic_ibss_chan->ic_flags); + tap->wt_chan_freq = htole16(ic->ic_curchan->ic_freq); + tap->wt_chan_flags = htole16(ic->ic_curchan->ic_flags); bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); } @@ -2106,7 +2109,7 @@ uint32_t data; int error; - if (IEEE80211_IS_CHAN_2GHZ(ni->ni_chan)) { + if (IEEE80211_IS_CHAN_2GHZ(ic->ic_bsschan)) { memset(&config, 0, sizeof config); config.bluetooth_coexistence = sc->bluetooth; config.antenna = sc->antenna; @@ -2135,7 +2138,7 @@ return error; /* the rate set has already been "negociated" */ - rs.mode = IEEE80211_IS_CHAN_5GHZ(ni->ni_chan) ? IWI_MODE_11A : + rs.mode = IEEE80211_IS_CHAN_5GHZ(ic->ic_bsschan) ? IWI_MODE_11A : IWI_MODE_11G; rs.type = IWI_RATESET_TYPE_NEGOCIATED; rs.nrates = ni->ni_rates.rs_nrates; @@ -2160,9 +2163,9 @@ return error; memset(&assoc, 0, sizeof assoc); - assoc.mode = IEEE80211_IS_CHAN_5GHZ(ni->ni_chan) ? IWI_MODE_11A : + assoc.mode = IEEE80211_IS_CHAN_5GHZ(ic->ic_bsschan) ? IWI_MODE_11A : IWI_MODE_11G; - assoc.chan = ieee80211_chan2ieee(ic, ni->ni_chan); + assoc.chan = ieee80211_chan2ieee(ic, ic->ic_bsschan); if (ni->ni_authmode == IEEE80211_AUTH_SHARED) assoc.auth = ic->ic_crypto.cs_def_txkey << 4 | IWI_AUTH_SHARED; if (ic->ic_opt_ie != NULL) @@ -2176,7 +2179,7 @@ if (ic->ic_flags & IEEE80211_F_PRIVACY) capinfo |= IEEE80211_CAPINFO_PRIVACY; if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) && - IEEE80211_IS_CHAN_2GHZ(ni->ni_chan)) + IEEE80211_IS_CHAN_2GHZ(ic->ic_bsschan)) capinfo |= IEEE80211_CAPINFO_SHORT_PREAMBLE; if (ic->ic_flags & IEEE80211_F_SHSLOT) capinfo |= IEEE80211_CAPINFO_SHORT_SLOTTIME; ==== //depot/projects/wifi/sys/dev/ral/if_ral.c#4 (text+ko) ==== @@ -342,6 +342,7 @@ struct ral_softc *sc = device_get_softc(dev); struct ifnet *ifp; struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211_channel *c; int error, i; sc->sc_dev = dev; @@ -423,19 +424,22 @@ /* set supported .11a channels */ for (i = 36; i <= 64; i += 4) { - ic->ic_channels[i].ic_freq = - ieee80211_ieee2mhz(i, IEEE80211_CHAN_5GHZ); - ic->ic_channels[i].ic_flags = IEEE80211_CHAN_A; + c = &ic->ic_channels[ic->ic_nchans++]; + c->ic_freq = ieee80211_ieee2mhz(i, IEEE80211_CHAN_5GHZ); + c->ic_flags = IEEE80211_CHAN_A; + c->ic_ieee = i; } for (i = 100; i <= 140; i += 4) { - ic->ic_channels[i].ic_freq = - ieee80211_ieee2mhz(i, IEEE80211_CHAN_5GHZ); - ic->ic_channels[i].ic_flags = IEEE80211_CHAN_A; + c = &ic->ic_channels[ic->ic_nchans++]; + c->ic_freq = ieee80211_ieee2mhz(i, IEEE80211_CHAN_5GHZ); + c->ic_flags = IEEE80211_CHAN_A; + c->ic_ieee = i; } for (i = 149; i <= 161; i += 4) { - ic->ic_channels[i].ic_freq = - ieee80211_ieee2mhz(i, IEEE80211_CHAN_5GHZ); - ic->ic_channels[i].ic_flags = IEEE80211_CHAN_A; + c = &ic->ic_channels[ic->ic_nchans++]; + c->ic_freq = ieee80211_ieee2mhz(i, IEEE80211_CHAN_5GHZ); + c->ic_flags = IEEE80211_CHAN_A; + c->ic_ieee = i; } } @@ -445,11 +449,13 @@ /* set supported .11b and .11g channels (1 through 14) */ for (i = 1; i <= 14; i++) { - ic->ic_channels[i].ic_freq = + c = &ic->ic_channels[ic->ic_nchans++]; + c->ic_freq = ieee80211_ieee2mhz(i, IEEE80211_CHAN_2GHZ); - ic->ic_channels[i].ic_flags = + c->ic_flags = IEEE80211_CHAN_CCK | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_DYN | IEEE80211_CHAN_2GHZ; + c->ic_ieee = i; } ieee80211_ifattach(ic); @@ -989,21 +995,21 @@ break; case IEEE80211_S_SCAN: - ral_set_chan(sc, ic->ic_bss->ni_chan); + ral_set_chan(sc, ic->ic_curchan); callout_reset(&sc->scan_ch, (sc->dwelltime * hz) / 1000, ral_next_scan, sc); break; case IEEE80211_S_AUTH: - ral_set_chan(sc, ic->ic_bss->ni_chan); + ral_set_chan(sc, ic->ic_curchan); break; case IEEE80211_S_ASSOC: - ral_set_chan(sc, ic->ic_bss->ni_chan); + ral_set_chan(sc, ic->ic_curchan); break; case IEEE80211_S_RUN: - ral_set_chan(sc, ic->ic_bss->ni_chan); + ral_set_chan(sc, ic->ic_curchan); if (ic->ic_opmode != IEEE80211_M_MONITOR) ral_set_bssid(sc, ic->ic_bss->ni_bssid); @@ -1354,9 +1360,9 @@ tap->wr_tsf = htole64(((uint64_t)tsf_hi << 32) | tsf_lo); tap->wr_flags = 0; - tap->wr_chan_freq = htole16(ic->ic_ibss_chan->ic_freq); + tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq); tap->wr_chan_flags = - htole16(ic->ic_ibss_chan->ic_flags); + htole16(ic->ic_curchan->ic_flags); tap->wr_antenna = sc->rx_ant; tap->wr_antsignal = desc->rssi; @@ -1711,7 +1717,7 @@ desc = &sc->bcnq.desc[sc->bcnq.cur]; data = &sc->bcnq.data[sc->bcnq.cur]; - rate = IEEE80211_IS_CHAN_5GHZ(ni->ni_chan) ? 12 : 4; + rate = IEEE80211_IS_CHAN_5GHZ(ic->ic_bsschan) ? 12 : 4; error = bus_dmamap_load_mbuf_sg(sc->bcnq.data_dmat, data->map, m0, segs, &nsegs, BUS_DMA_NOWAIT); @@ -1727,8 +1733,8 @@ tap->wt_flags = 0; tap->wt_rate = rate; - tap->wt_chan_freq = htole16(ic->ic_ibss_chan->ic_freq); - tap->wt_chan_flags = htole16(ic->ic_ibss_chan->ic_flags); + tap->wt_chan_freq = htole16(ic->ic_curchan->ic_freq); + tap->wt_chan_flags = htole16(ic->ic_curchan->ic_flags); tap->wt_antenna = sc->tx_ant; bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); @@ -1767,7 +1773,7 @@ desc = &sc->prioq.desc[sc->prioq.cur]; data = &sc->prioq.data[sc->prioq.cur]; - rate = IEEE80211_IS_CHAN_5GHZ(ni->ni_chan) ? 12 : 4; + rate = IEEE80211_IS_CHAN_5GHZ(ic->ic_curchan) ? 12 : 4; error = bus_dmamap_load_mbuf_sg(sc->prioq.data_dmat, data->map, m0, segs, &nsegs, 0); @@ -1783,8 +1789,8 @@ tap->wt_flags = 0; tap->wt_rate = rate; - tap->wt_chan_freq = htole16(ic->ic_ibss_chan->ic_freq); - tap->wt_chan_flags = htole16(ic->ic_ibss_chan->ic_flags); + tap->wt_chan_freq = htole16(ic->ic_curchan->ic_freq); + tap->wt_chan_flags = htole16(ic->ic_curchan->ic_flags); tap->wt_antenna = sc->tx_ant; bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); @@ -1875,16 +1881,14 @@ wh = mtod(m0, struct ieee80211_frame *); - if (ic->ic_fixed_rate != -1) { - rs = &ic->ic_sup_rates[ic->ic_curmode]; - rate = rs->rs_rates[ic->ic_fixed_rate]; - } else { + if (ic->ic_fixed_rate == IEEE80211_FIXED_RATE_NONE) { rs = &ni->ni_rates; rn = (struct ral_node *)ni; ni->ni_txrate = ral_rssadapt_choose(&rn->rssadapt, rs, wh, m0->m_pkthdr.len, NULL, 0); rate = rs->rs_rates[ni->ni_txrate]; - } + } else + rate = ic->ic_fixed_rate; rate &= IEEE80211_RATE_VAL; if (wh->i_fc[1] & IEEE80211_FC1_WEP) { @@ -1909,7 +1913,7 @@ uint16_t dur; int rtsrate, ackrate; - rtsrate = IEEE80211_IS_CHAN_5GHZ(ni->ni_chan) ? 12 : 4; + rtsrate = IEEE80211_IS_CHAN_5GHZ(ic->ic_curchan) ? 12 : 4; ackrate = ral_ack_rate(rate); dur = ral_txtime(m0->m_pkthdr.len + 4, rate, ic->ic_flags) + @@ -1998,8 +2002,8 @@ tap->wt_flags = 0; tap->wt_rate = rate; - tap->wt_chan_freq = htole16(ic->ic_ibss_chan->ic_freq); - tap->wt_chan_flags = htole16(ic->ic_ibss_chan->ic_flags); + tap->wt_chan_freq = htole16(ic->ic_curchan->ic_freq); + tap->wt_chan_flags = htole16(ic->ic_curchan->ic_flags); tap->wt_antenna = sc->tx_ant; bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); @@ -2009,7 +2013,7 @@ data->ni = ni; /* remember link conditions for rate adaptation algorithm */ - if (ic->ic_fixed_rate == -1) { + if (ic->ic_fixed_rate == IEEE80211_FIXED_RATE_NONE) { data->id.id_len = m0->m_pkthdr.len; data->id.id_rateidx = ni->ni_txrate; data->id.id_node = ni; @@ -2159,7 +2163,7 @@ if (ic->ic_opmode != IEEE80211_M_MONITOR) return ENETRESET; - ral_set_chan(sc, ic->ic_ibss_chan); + ral_set_chan(sc, ic->ic_curchan); return 0; } @@ -2469,7 +2473,7 @@ pifs = sifs + slottime; difs = sifs + 2 * slottime; eifs = sifs + ral_txtime(RAL_ACK_SIZE, - (ic->ic_curmode == IEEE80211_MODE_11A) ? 12 : 2, 0) + difs; + IEEE80211_IS_CHAN_A(ic->ic_curchan) ? 12 : 2, 0) + difs; tmp = RAL_READ(sc, RAL_CSR11); tmp = (tmp & ~0x1f00) | slottime << 8; @@ -2737,8 +2741,7 @@ } /* set default BSS channel */ - ic->ic_bss->ni_chan = ic->ic_ibss_chan; - ral_set_chan(sc, ic->ic_bss->ni_chan); + ral_set_chan(sc, ic->ic_curchan); /* kick Rx */ tmp = RAL_DROP_PHY_ERROR | RAL_DROP_CRC_ERROR; ==== //depot/projects/wifi/sys/dev/usb/if_ural.c#4 (text+ko) ==== @@ -355,6 +355,7 @@ USB_ATTACH_START(ural, sc, uaa); struct ifnet *ifp; struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211_channel *c; usb_interface_descriptor_t *id; usb_endpoint_descriptor_t *ed; usbd_status error; @@ -456,19 +457,22 @@ /* set supported .11a channels */ for (i = 36; i <= 64; i += 4) { - ic->ic_channels[i].ic_freq = - ieee80211_ieee2mhz(i, IEEE80211_CHAN_5GHZ); - ic->ic_channels[i].ic_flags = IEEE80211_CHAN_A; + c = &ic->ic_channels[ic->ic_nchans++]; + c->ic_freq = ieee80211_ieee2mhz(i, IEEE80211_CHAN_5GHZ); + c->ic_flags = IEEE80211_CHAN_A; + c->ic_ieee = i; } for (i = 100; i <= 140; i += 4) { - ic->ic_channels[i].ic_freq = - ieee80211_ieee2mhz(i, IEEE80211_CHAN_5GHZ); - ic->ic_channels[i].ic_flags = IEEE80211_CHAN_A; + c = &ic->ic_channels[ic->ic_nchans++]; + c->ic_freq = ieee80211_ieee2mhz(i, IEEE80211_CHAN_5GHZ); + c->ic_flags = IEEE80211_CHAN_A; + c->ic_ieee = i; } for (i = 149; i <= 161; i += 4) { - ic->ic_channels[i].ic_freq = - ieee80211_ieee2mhz(i, IEEE80211_CHAN_5GHZ); - ic->ic_channels[i].ic_flags = IEEE80211_CHAN_A; + c = &ic->ic_channels[ic->ic_nchans++]; + c->ic_freq = ieee80211_ieee2mhz(i, IEEE80211_CHAN_5GHZ); + c->ic_flags = IEEE80211_CHAN_A; + c->ic_ieee = i; } } @@ -478,11 +482,13 @@ /* set supported .11b and .11g channels (1 through 14) */ for (i = 1; i <= 14; i++) { - ic->ic_channels[i].ic_freq = + c = &ic->ic_channels[ic->ic_nchans++]; + c->ic_freq = ieee80211_ieee2mhz(i, IEEE80211_CHAN_2GHZ); - ic->ic_channels[i].ic_flags = + c->ic_flags = IEEE80211_CHAN_CCK | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_DYN | IEEE80211_CHAN_2GHZ; + c->ic_ieee = i; } ieee80211_ifattach(ic); @@ -721,20 +727,20 @@ break; case IEEE80211_S_SCAN: - ural_set_chan(sc, ic->ic_bss->ni_chan); + ural_set_chan(sc, ic->ic_curchan); callout_reset(&sc->scan_ch, hz / 5, ural_next_scan, sc); break; case IEEE80211_S_AUTH: - ural_set_chan(sc, ic->ic_bss->ni_chan); + ural_set_chan(sc, ic->ic_curchan); break; case IEEE80211_S_ASSOC: - ural_set_chan(sc, ic->ic_bss->ni_chan); + ural_set_chan(sc, ic->ic_curchan); break; case IEEE80211_S_RUN: - ural_set_chan(sc, ic->ic_bss->ni_chan); + ural_set_chan(sc, ic->ic_bsschan); if (ic->ic_opmode != IEEE80211_M_MONITOR) ural_set_bssid(sc, ic->ic_bss->ni_bssid); @@ -1124,15 +1130,15 @@ data = &sc->tx_data[0]; desc = (struct ural_tx_desc *)data->buf; - rate = IEEE80211_IS_CHAN_5GHZ(ni->ni_chan) ? 12 : 4; + rate = IEEE80211_IS_CHAN_5GHZ(ic->ic_curchan) ? 12 : 4; if (sc->sc_drvbpf != NULL) { struct ural_tx_radiotap_header *tap = &sc->sc_txtap; tap->wt_flags = 0; tap->wt_rate = rate; - tap->wt_chan_freq = htole16(ic->ic_ibss_chan->ic_freq); - tap->wt_chan_flags = htole16(ic->ic_ibss_chan->ic_flags); + tap->wt_chan_freq = htole16(ic->ic_curchan->ic_freq); + tap->wt_chan_flags = htole16(ic->ic_curchan->ic_flags); tap->wt_antenna = sc->tx_ant; bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); @@ -1195,8 +1201,8 @@ wh = mtod(m0, struct ieee80211_frame *); /* XXX should do automatic rate adaptation */ - if (ic->ic_fixed_rate != -1) - rate = ic->ic_bss->ni_rates.rs_rates[ic->ic_fixed_rate]; + if (ic->ic_fixed_rate != IEEE80211_FIXED_RATE_NONE) + rate = ic->ic_fixed_rate; else rate = ni->ni_rates.rs_rates[ni->ni_txrate]; @@ -1218,8 +1224,8 @@ tap->wt_flags = 0; tap->wt_rate = rate; - tap->wt_chan_freq = htole16(ic->ic_ibss_chan->ic_freq); - tap->wt_chan_flags = htole16(ic->ic_ibss_chan->ic_flags); + tap->wt_chan_freq = htole16(ic->ic_curchan->ic_freq); + tap->wt_chan_flags = htole16(ic->ic_curchan->ic_flags); tap->wt_antenna = sc->tx_ant; bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0); @@ -1374,7 +1380,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jul 16 01:21:24 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8932216A420; Sat, 16 Jul 2005 01:21:23 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1EF8816A41C for ; Sat, 16 Jul 2005 01:21:23 +0000 (GMT) (envelope-from soc-anders@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C688943D45 for ; Sat, 16 Jul 2005 01:21:22 +0000 (GMT) (envelope-from soc-anders@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6G1LMH6050598 for ; Sat, 16 Jul 2005 01:21:22 GMT (envelope-from soc-anders@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6G1LMk6050595 for perforce@freebsd.org; Sat, 16 Jul 2005 01:21:22 GMT (envelope-from soc-anders@freebsd.org) Date: Sat, 16 Jul 2005 01:21:22 GMT Message-Id: <200507160121.j6G1LMk6050595@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-anders@freebsd.org using -f From: soc-anders To: Perforce Change Reviews Cc: Subject: PERFORCE change 80309 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jul 2005 01:21:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=80309 Change 80309 by soc-anders@soc-anders_gimli on 2005/07/16 01:20:57 Routing information is now obtained using only sysctl. Extended previous work such that information provided is more complete. Issues: * -A flag will for obvious reasons not work, and the goal it to have that be part of a separate debugging tool. * Reference count (rt_refcnt) is not available. * -rs mode currently disables due to kvm usage. Should rtstat be available via sysctl? Affected files ... .. //depot/projects/soc2005/ifcleanup/src/src/usr.bin/netstat/route.c#2 edit Differences ... ==== //depot/projects/soc2005/ifcleanup/src/src/usr.bin/netstat/route.c#2 (text+ko) ==== @@ -47,10 +47,8 @@ #include #include -#include #include #include -#include #include #include @@ -71,8 +69,6 @@ #include #include "netstat.h" -#define kget(p, d) (kread((u_long)(p), (char *)&(d), sizeof (d))) - /* * Definitions for showing gateway flags. */ @@ -107,22 +103,7 @@ u_short u_data[128]; } sa_u; -static sa_u pt_u; - -int do_rtent = 0; -struct rtentry rtentry; -struct radix_node rnode; -struct radix_mask rmask; -struct radix_node_head *rt_tables[AF_MAX+1]; - -int NewTree = 0; - -static struct sockaddr *kgetsa (struct sockaddr *); -static void size_cols (int ef, struct radix_node *rn); -static void size_cols_tree (struct radix_node *rn); -static void size_cols_rtentry (struct rtentry *rt); -static void p_tree (struct radix_node *); -static void p_rtnode (void); +static void size_cols (int ef); static void ntreestuff (void); static void np_rtentry (struct rt_msghdr *); static void p_sockaddr (struct sockaddr *, struct sockaddr *, int, int); @@ -130,7 +111,6 @@ int flags); static void p_flags (int, const char *); static const char *fmt_flags(int f); -static void p_rtentry (struct rtentry *); static u_long forgemask (u_long); static void domask (char *, u_long, u_long); @@ -140,38 +120,9 @@ void routepr(u_long rtree) { - struct radix_node_head *rnh, head; - int i; - printf("Routing tables\n"); - if (Aflag == 0 && NewTree) - ntreestuff(); - else { - if (rtree == 0) { - printf("rt_tables: symbol not in namelist\n"); - return; - } - - kget(rtree, rt_tables); - for (i = 0; i <= AF_MAX; i++) { - if ((rnh = rt_tables[i]) == 0) - continue; - kget(rnh, head); - if (i == AF_UNSPEC) { - if (Aflag && af == 0) { - printf("Netmasks:\n"); - p_tree(head.rnh_treetop); - } - } else if (af == AF_UNSPEC || af == i) { - size_cols(i, head.rnh_treetop); - pr_family(i); - do_rtent = 1; - pr_rthdr(i); - p_tree(head.rnh_treetop); - } - } - } + ntreestuff(); } /* @@ -239,7 +190,7 @@ static int wid_expire; static void -size_cols(int ef, struct radix_node *rn) +size_cols(int ef) { wid_dst = WID_DST_DEFAULT(ef); wid_gw = WID_GW_DEFAULT(ef); @@ -249,126 +200,29 @@ wid_mtu = 6; wid_if = WID_IF_DEFAULT(ef); wid_expire = 6; - - if (Wflag) - size_cols_tree(rn); -} - -static void -size_cols_tree(struct radix_node *rn) -{ -again: - kget(rn, rnode); - if (rnode.rn_bit < 0) { - if ((rnode.rn_flags & RNF_ROOT) == 0) { - kget(rn, rtentry); - size_cols_rtentry(&rtentry); - } - if ((rn = rnode.rn_dupedkey)) - goto again; - } else { - rn = rnode.rn_right; - size_cols_tree(rnode.rn_left); - size_cols_tree(rn); - } -} - -static void -size_cols_rtentry(struct rtentry *rt) -{ - static struct ifnet ifnet, *lastif; - struct rtentry parent; - static char buffer[100]; - const char *bp; - struct sockaddr *sa; - sa_u addr, mask; - int len; - - /* - * Don't print protocol-cloned routes unless -a. - */ - if (rt->rt_flags & RTF_WASCLONED && !aflag) { - kget(rt->rt_parent, parent); - if (parent.rt_flags & RTF_PRCLONING) - return; - } - - bzero(&addr, sizeof(addr)); - if ((sa = kgetsa(rt_key(rt)))) - bcopy(sa, &addr, sa->sa_len); - bzero(&mask, sizeof(mask)); - if (rt_mask(rt) && (sa = kgetsa(rt_mask(rt)))) - bcopy(sa, &mask, sa->sa_len); - bp = fmt_sockaddr(&addr.u_sa, &mask.u_sa, rt->rt_flags); - len = strlen(bp); - wid_dst = MAX(len, wid_dst); - - bp = fmt_sockaddr(kgetsa(rt->rt_gateway), NULL, RTF_HOST); - len = strlen(bp); - wid_gw = MAX(len, wid_gw); - - bp = fmt_flags(rt->rt_flags); - len = strlen(bp); - wid_flags = MAX(len, wid_flags); - - if (addr.u_sa.sa_family == AF_INET || Wflag) { - len = snprintf(buffer, sizeof(buffer), "%ld", rt->rt_refcnt); - wid_refs = MAX(len, wid_refs); - len = snprintf(buffer, sizeof(buffer), "%lu", rt->rt_use); - wid_use = MAX(len, wid_use); - if (Wflag && rt->rt_rmx.rmx_mtu != 0) { - len = snprintf(buffer, sizeof(buffer), - "%lu", rt->rt_rmx.rmx_mtu); - wid_mtu = MAX(len, wid_mtu); - } - } - if (rt->rt_ifp) { - if (rt->rt_ifp != lastif) { - kget(rt->rt_ifp, ifnet); - lastif = rt->rt_ifp; - len = strlen(ifnet.if_xname); - wid_if = MAX(len, wid_if); - } - if (rt->rt_rmx.rmx_expire) { - time_t expire_time; - - if ((expire_time = - rt->rt_rmx.rmx_expire - time(NULL)) > 0) { - len = snprintf(buffer, sizeof(buffer), "%d", - (int)expire_time); - wid_expire = MAX(len, wid_expire); - } - } - } } - /* * Print header for routing table columns. */ void pr_rthdr(int af1) { - - if (Aflag) - printf("%-8.8s ","Address"); if (af1 == AF_INET || Wflag) { if (Wflag) { - printf("%-*.*s %-*.*s %-*.*s %*.*s %*.*s %*.*s %*.*s %*s\n", + printf("%-*.*s %-*.*s %-*.*s %*.*s %*.*s %*.*s %*s\n", wid_dst, wid_dst, "Destination", wid_gw, wid_gw, "Gateway", wid_flags, wid_flags, "Flags", - wid_refs, wid_refs, "Refs", wid_use, wid_use, "Use", wid_mtu, wid_mtu, "Mtu", wid_if, wid_if, "Netif", wid_expire, "Expire"); } else { - printf("%-*.*s %-*.*s %-*.*s %*.*s %*.*s %*.*s %*s\n", + printf("%-*.*s %-*.*s %-*.*s %*.*s %*.*s %*s\n", wid_dst, wid_dst, "Destination", wid_gw, wid_gw, "Gateway", wid_flags, wid_flags, "Flags", - wid_refs, wid_refs, "Refs", wid_use, wid_use, "Use", wid_if, wid_if, "Netif", wid_expire, "Expire"); @@ -383,92 +237,7 @@ } } -static struct sockaddr * -kgetsa(struct sockaddr *dst) -{ - - kget(dst, pt_u.u_sa); - if (pt_u.u_sa.sa_len > sizeof (pt_u.u_sa)) - kread((u_long)dst, (char *)pt_u.u_data, pt_u.u_sa.sa_len); - return (&pt_u.u_sa); -} - -static void -p_tree(struct radix_node *rn) -{ - -again: - kget(rn, rnode); - if (rnode.rn_bit < 0) { - if (Aflag) - printf("%-8.8lx ", (u_long)rn); - if (rnode.rn_flags & RNF_ROOT) { - if (Aflag) - printf("(root node)%s", - rnode.rn_dupedkey ? " =>\n" : "\n"); - } else if (do_rtent) { - kget(rn, rtentry); - p_rtentry(&rtentry); - if (Aflag) - p_rtnode(); - } else { - p_sockaddr(kgetsa((struct sockaddr *)rnode.rn_key), - NULL, 0, 44); - putchar('\n'); - } - if ((rn = rnode.rn_dupedkey)) - goto again; - } else { - if (Aflag && do_rtent) { - printf("%-8.8lx ", (u_long)rn); - p_rtnode(); - } - rn = rnode.rn_right; - p_tree(rnode.rn_left); - p_tree(rn); - } -} - -char nbuf[20]; - static void -p_rtnode(void) -{ - struct radix_mask *rm = rnode.rn_mklist; - - if (rnode.rn_bit < 0) { - if (rnode.rn_mask) { - printf("\t mask "); - p_sockaddr(kgetsa((struct sockaddr *)rnode.rn_mask), - NULL, 0, -1); - } else if (rm == 0) - return; - } else { - sprintf(nbuf, "(%d)", rnode.rn_bit); - printf("%6.6s %8.8lx : %8.8lx", nbuf, (u_long)rnode.rn_left, (u_long)rnode.rn_right); - } - while (rm) { - kget(rm, rmask); - sprintf(nbuf, " %d refs, ", rmask.rm_refs); - printf(" mk = %8.8lx {(%d),%s", - (u_long)rm, -1 - rmask.rm_bit, rmask.rm_refs ? nbuf : " "); - if (rmask.rm_flags & RNF_NORMAL) { - struct radix_node rnode_aux; - printf(" , "); - kget(rmask.rm_leaf, rnode_aux); - p_sockaddr(kgetsa((struct sockaddr *)rnode_aux.rn_mask), - NULL, 0, -1); - } else - p_sockaddr(kgetsa((struct sockaddr *)rmask.rm_mask), - NULL, 0, -1); - putchar('}'); - if ((rm = rmask.rm_mklist)) - printf(" ->"); - } - putchar('\n'); -} - -static void ntreestuff(void) { size_t needed; @@ -479,7 +248,7 @@ mib[0] = CTL_NET; mib[1] = PF_ROUTE; mib[2] = 0; - mib[3] = 0; + mib[3] = af; mib[4] = NET_RT_DUMP; mib[5] = 0; if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0) { @@ -502,12 +271,46 @@ static void np_rtentry(struct rt_msghdr *rtm) { - struct sockaddr *sa = (struct sockaddr *)(rtm + 1); + + char *cp = (char *)(rtm) + sizeof(*rtm); + char ifname[IFNAMSIZ]; + char buffer[100]; + sa_u dst, gw, mask, genmask; #ifdef notdef static int masks_done, banner_printed; #endif static int old_af; - int af1 = 0, interesting = RTF_UP | RTF_GATEWAY | RTF_HOST; + int af1 = 0; + int addrs = rtm->rtm_addrs; + int i; + + bzero(&dst, sizeof(dst)); bzero(&gw, sizeof(gw)); + bzero(&mask, sizeof(mask)); bzero(&genmask, sizeof(genmask)); + for (i = 0; addrs != 0 && i < RTAX_MAX; addrs &= ~(1<sa_len == 0) + continue; + + switch (1<sa_len); + break; + case RTA_GATEWAY: + bcopy(sa, &gw, sa->sa_len); + break; + case RTA_NETMASK: + bcopy(sa, &mask, sa->sa_len); + break; + case RTA_GENMASK: + bcopy(sa, &genmask, sa->sa_len); + break; + default: + break; + } + } #ifdef notdef /* for the moment, netmasks are skipped over */ @@ -522,19 +325,42 @@ } } else #endif - af1 = sa->sa_family; + af1 = dst.u_sa.sa_family; if (af1 != old_af) { pr_family(af1); + size_cols(af1); + pr_rthdr(af1); old_af = af1; } if (rtm->rtm_addrs == RTA_DST) - p_sockaddr(sa, NULL, 0, 36); + p_sockaddr(&dst.u_sa, NULL, 0, wid_dst+wid_gw); else { - p_sockaddr(sa, NULL, rtm->rtm_flags, 16); - sa = (struct sockaddr *)(SA_SIZE(sa) + (char *)sa); - p_sockaddr(sa, NULL, 0, 18); + p_sockaddr(&dst.u_sa, rtm->rtm_addrs&RTA_NETMASK?&mask.u_sa:NULL, + rtm->rtm_flags, wid_dst); + p_sockaddr(&gw.u_sa, NULL, RTF_HOST, wid_gw); + } + snprintf(buffer, sizeof(buffer), "%%-%d.%ds ", wid_flags, wid_flags); + p_flags(rtm->rtm_flags, buffer); + + if (dst.u_sa.sa_family == AF_INET || Wflag) { + printf("%*d ", 6, rtm->rtm_use); + if (Wflag) { + if (rtm->rtm_rmx.rmx_mtu != 0) + printf("%*lu ", wid_mtu, rtm->rtm_rmx.rmx_mtu); + else + printf("%*s ", wid_mtu, ""); + } + } + printf("%*.*s", wid_if, wid_if, + if_indextoname(rtm->rtm_index, ifname)); + + if (rtm->rtm_rmx.rmx_expire) { + time_t expire_time; + + if ((expire_time = + rtm->rtm_rmx.rmx_expire - time((time_t *)0)) > 0) + printf(" %*d", wid_expire, (int)expire_time); } - p_flags(rtm->rtm_flags & interesting, "%-6.6s "); putchar('\n'); } @@ -701,65 +527,6 @@ return (name); } -static void -p_rtentry(struct rtentry *rt) -{ - static struct ifnet ifnet, *lastif; - struct rtentry parent; - static char buffer[128]; - static char prettyname[128]; - struct sockaddr *sa; - sa_u addr, mask; - - /* - * Don't print protocol-cloned routes unless -a. - */ - if (rt->rt_flags & RTF_WASCLONED && !aflag) { - kget(rt->rt_parent, parent); - if (parent.rt_flags & RTF_PRCLONING) - return; - } - - bzero(&addr, sizeof(addr)); - if ((sa = kgetsa(rt_key(rt)))) - bcopy(sa, &addr, sa->sa_len); - bzero(&mask, sizeof(mask)); - if (rt_mask(rt) && (sa = kgetsa(rt_mask(rt)))) - bcopy(sa, &mask, sa->sa_len); - p_sockaddr(&addr.u_sa, &mask.u_sa, rt->rt_flags, wid_dst); - p_sockaddr(kgetsa(rt->rt_gateway), NULL, RTF_HOST, wid_gw); - snprintf(buffer, sizeof(buffer), "%%-%d.%ds ", wid_flags, wid_flags); - p_flags(rt->rt_flags, buffer); - if (addr.u_sa.sa_family == AF_INET || Wflag) { - printf("%*ld %*lu ", wid_refs, rt->rt_refcnt, - wid_use, rt->rt_use); - if (Wflag) { - if (rt->rt_rmx.rmx_mtu != 0) - printf("%*lu ", wid_mtu, rt->rt_rmx.rmx_mtu); - else - printf("%*s ", wid_mtu, ""); - } - } - if (rt->rt_ifp) { - if (rt->rt_ifp != lastif) { - kget(rt->rt_ifp, ifnet); - lastif = rt->rt_ifp; - strlcpy(prettyname, ifnet.if_xname, sizeof(prettyname)); - } - printf("%*.*s", wid_if, wid_if, prettyname); - if (rt->rt_rmx.rmx_expire) { - time_t expire_time; - - if ((expire_time = - rt->rt_rmx.rmx_expire - time((time_t *)0)) > 0) - printf(" %*d", wid_expire, (int)expire_time); - } - if (rt->rt_nodes[0].rn_dupedkey) - printf(" =>"); - } - putchar('\n'); -} - char * routename(u_long in) { @@ -989,6 +756,11 @@ struct rtstat rtstat; int rttrash; + /* IFCLEANUP + * rtstat should be accessible via sysctl.. until then skip this + */ + return; + if (rtsaddr == 0) { printf("rtstat: symbol not in namelist\n"); return; From owner-p4-projects@FreeBSD.ORG Sat Jul 16 15:08:01 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4654D16A427; Sat, 16 Jul 2005 15:08:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 17D5516A423 for ; Sat, 16 Jul 2005 15:08:01 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C50F643D46 for ; Sat, 16 Jul 2005 15:08:00 +0000 (GMT) (envelope-from soc-victor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6GF80u0003586 for ; Sat, 16 Jul 2005 15:08:00 GMT (envelope-from soc-victor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6GF80gS003579 for perforce@freebsd.org; Sat, 16 Jul 2005 15:08:00 GMT (envelope-from soc-victor@freebsd.org) Date: Sat, 16 Jul 2005 15:08:00 GMT Message-Id: <200507161508.j6GF80gS003579@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-victor@freebsd.org using -f From: soc-victor To: Perforce Change Reviews Cc: Subject: PERFORCE change 80349 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jul 2005 15:08:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=80349 Change 80349 by soc-victor@soc-victor_82.76.158.176 on 2005/07/16 15:07:54 Added some VM entries for hrStorageTable. Should be changed to be based on libmemestat - ASAP. Affected files ... .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#5 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#7 edit .. //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c#4 edit Differences ... ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#5 (text+ko) ==== @@ -149,7 +149,7 @@ case LEAF_hrSystemDate: { u_char s_date_time[11]; int s_date_time_len = -1; - if((s_date_time_len = OS_getSystemDate(s_date_time)) < 0){ + if((s_date_time_len = OS_getSystemDate(s_date_time)) < 0) { return (SNMP_ERR_GENERR); } return (string_get(value, s_date_time, s_date_time_len)); @@ -350,8 +350,8 @@ /*first time, do the sysctl*/ - struct timeval kernel_boot_timestamp={0,0}; - int mib[2]={CTL_KERN,KERN_BOOTTIME}; + struct timeval kernel_boot_timestamp={ 0, 0 }; + int mib[2]={ CTL_KERN, KERN_BOOTTIME }; size_t len = sizeof(kernel_boot_timestamp); if(sysctl(mib, 2, &kernel_boot_timestamp, &len, NULL, 0) == -1) { @@ -498,14 +498,14 @@ int OS_getSystemMaxProcesses(void) { if( hrState_g.max_proc == 0 ) { - int mib[2] = {CTL_KERN, KERN_MAXPROC}; + int mib[2] = { CTL_KERN, KERN_MAXPROC }; size_t len = 0; len = sizeof(hrState_g.max_proc); if(sysctl(mib, 2, &hrState_g.max_proc, &len, NULL, 0) == -1) { syslog(LOG_ERR, "sysctl KERN_MAXPROC failed: %m "); return (-1); /*error*/ } - HR_DPRINTF((stderr, "Got kernel maxporc: %d\n",hrState_g.max_proc)); + HR_DPRINTF((stderr, "Got kernel maxporc: %d\n", hrState_g.max_proc)); } return (hrState_g.max_proc); ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#7 (text+ko) ==== @@ -44,6 +44,7 @@ #include /*for getfsstat*/ #include /*for getfsstat*/ +#include /*a debug macro*/ #ifndef NDEBUG @@ -115,10 +116,11 @@ struct storage_tbl hr_storage_tbl; /*the head of the list with table's entries */ uint64_t hr_tick; - struct kvm_swap *swap_devs; /*for kvm_getswapinfo*/ + struct kvm_swap *swap_devs; /*for kvm_getswapinfo, malloc'd*/ size_t swap_devs_len; /*idem */ - struct statfs *fs_buf; /*for getfsstat*/ + struct statfs *fs_buf; /*for getfsstat, malloc'd*/ size_t fs_buf_count; /*idem*/ + struct vmtotal mem_stats; uint32_t next_hrStorage_index; /*next int availabe for indexing the hrStorageTable*/ time_t hrStorage_tbl_age; ==== //depot/projects/soc2005/bsnmp/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c#4 (text+ko) ==== @@ -40,14 +40,10 @@ #include #include #include /*for getpagesize()*/ +#include -static -void hrStorage_get_vm_v(void){ - /*FIX ME*/ - HR_DPRINTF((stderr, "WARNING: hrStorageTable vm not implmeneted yet.\n ")); -} static @@ -138,7 +134,67 @@ return (NULL); } +/* + * Very silly implementation for VM info. + * Should be changed to use libmemestat API + * (Robert N M Watson has just created, not yet + * available for public for the time being) + * FIX ME + */ + static +void hrStorage_get_vm_v(void) { + /*FIX ME*/ + int mib[2] = { CTL_VM, VM_TOTAL }; + int len = sizeof(hrState_g.mem_stats); + int page_size_bytes; + struct hrStorageTblEntry *entry = NULL; + if( sysctl(mib, 2, &hrState_g.mem_stats, &len, NULL, 0) < 0 ) { + syslog(LOG_ERR, "%s: sysctl( { CTL_VM, VM_METER } ) failed: %m ", __func__ ); + assert(0); + return; + } + + page_size_bytes = getpagesize(); + + + + /*Real Memory Metrics*/ + entry = hrStorageTblEntry_find_by_name("Real Memory Metrics"); + if( entry == NULL ) { + entry = hrStorageTblEntry_create("Real Memory Metrics"); + } + assert(entry != NULL); + if( entry == NULL) return; /*I'm out of luck now, maybe next time*/ + + entry->flags |= HR_STORAGE_FOUND; + entry->type = (struct asn_oid)OIDX_hrStorageRam; + entry->allocationUnits = page_size_bytes; + entry->size = hrState_g.mem_stats.t_rm; + entry->used = hrState_g.mem_stats.t_arm; /*ACTIVE is not USED - FIX ME */ + entry->allocationFailures = 0; + + + + /*Shared Real Memory Metrics*/ + entry = hrStorageTblEntry_find_by_name("Shared Real Memory Metrics"); + if( entry == NULL ) { + entry = hrStorageTblEntry_create("Shared Real Memory Metrics"); + } + assert(entry != NULL); + if( entry == NULL) return; /*I'm out of luck now, maybe next time*/ + + entry->flags |= HR_STORAGE_FOUND; + entry->type = (struct asn_oid)OIDX_hrStorageRam; + entry->allocationUnits = page_size_bytes; + entry->size = hrState_g.mem_stats.t_rmshr; + entry->used = hrState_g.mem_stats.t_armshr; /*ACTIVE is not USED - FIX ME */ + entry->allocationFailures = 0; + +} + + +static void hrStorage_get_swap_v(void) { int nswapdev = 0; int len = sizeof(nswapdev); @@ -350,7 +406,8 @@ hrState_g.fs_buf = NULL; hrState_g.fs_buf_count = 0; - + memset( &hrState_g.mem_stats, 0, sizeof(hrState_g.mem_stats) ); + hrState_g.next_hrStorage_index = 1; STAILQ_INIT(&hrState_g.storage_name_map); @@ -449,7 +506,7 @@ /* refresh entries here?! */ - if ( (time(NULL) - hrState_g.hrStorage_tbl_age) > 7 ) { + if ( (time(NULL) - hrState_g.hrStorage_tbl_age) > HR_STORAGE_TBL_REFRESH ) { HR_DPRINTF((stderr, "%s: need refresh\n ",__func__)); refresh_hrStorage_tbl_v(); } From owner-p4-projects@FreeBSD.ORG Sat Jul 16 17:52:22 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D76016A420; Sat, 16 Jul 2005 17:52:21 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 49E8316A41C for ; Sat, 16 Jul 2005 17:52:21 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0DB5843D45 for ; Sat, 16 Jul 2005 17:52:21 +0000 (GMT) (envelope-from soc-saturnero@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6GHqKRR017463 for ; Sat, 16 Jul 2005 17:52:20 GMT (envelope-from soc-saturnero@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6GHqKqO017460 for perforce@freebsd.org; Sat, 16 Jul 2005 17:52:20 GMT (envelope-from soc-saturnero@freebsd.org) Date: Sat, 16 Jul 2005 17:52:20 GMT Message-Id: <200507161752.j6GHqKqO017460@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-saturnero@freebsd.org using -f From: soc-saturnero To: Perforce Change Reviews Cc: Subject: PERFORCE change 80354 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jul 2005 17:52:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=80354 Change 80354 by soc-saturnero@soc-saturnero_sberta on 2005/07/16 17:51:31 Continuing work. Buildworld phase. head-banging with exit 1 inside an sh function Affected files ... .. //depot/projects/soc2005/freesbie/Makefile#2 edit .. //depot/projects/soc2005/freesbie/conf/freesbie.defaults.conf#3 edit .. //depot/projects/soc2005/freesbie/scripts/buildworld.sh#1 add .. //depot/projects/soc2005/freesbie/scripts/launch.sh#2 edit .. //depot/projects/soc2005/freesbie/scripts/mtree.sh#2 delete Differences ... ==== //depot/projects/soc2005/freesbie/Makefile#2 (text+ko) ==== @@ -5,14 +5,14 @@ # # $FreeBSD$ -all: mtree +all: buildworld -mtree: .done_mtree -.done_mtree: - @-rm -f .tmp_mtree - @touch .tmp_mtree - ./scripts/mtree.sh - @mv .tmp_mtree .done_mtree +buildworld: .done_buildworld +.done_buildworld: + @-rm -f .tmp_buildworld + @touch .tmp_buildworld + @sh ./scripts/launch.sh buildworld .tmp_buildworld + @mv .tmp_buildworld .done_buildworld clean: - @-rm -rf .tmp* .done* > /dev/null 2>&1+ @-rm -rf .tmp* .done* > /dev/null 2>&1 ==== //depot/projects/soc2005/freesbie/conf/freesbie.defaults.conf#3 (text+ko) ==== @@ -26,23 +26,21 @@ IMGPATH="FreeSBIE.img" - - +# # Optional variables # Arguments passed to make(1) when building world and kernel # MAKEOPT="-j3" -# Kernel configuration file, transparently passed to the kernel build, -# if defined +# Kernel configuration file, with complete path # -#KERNCONF=MYCUSTOMKERNEL +#KERNELCONF=/complete/path/to/MYCUSTOMKERNEL -# Kernel configuration directory, transparently passed to the kernel -# build, if defined +# If you want to use a custom make.conf, define it here. Otherwise, +# make.conf or make.conf.minimal under conf/ are used. # -#KERNCONFDIR=/my/custom/dir +#MAKE_CONF=/etc/make.conf # Define MINIMAL to build a minimal world (i.e.: use # make.conf.minimal, full of NO_* knobs. ==== //depot/projects/soc2005/freesbie/scripts/launch.sh#2 (text+ko) ==== @@ -7,10 +7,51 @@ # See COPYING for license terms. # # $FreeBSD$ +# +# Usage: launch.sh ${TARGET} [ ${LOGFILE} ] + +set -e -u + +if [ "`id -u`" != "0" ]; then + echo "Sorry, this must be done as root." + exit 1 +fi + +# If the DEBUG environment variable is set, be verbose. +[ ! -z "${DEBUG:-}" ] && set -x + +# Set the absolute path for the toolkit dir +LOCALDIR=$(cd $(dirname $0)/.. && pwd) +TARGET=$1; +shift; +if [ -n "$1" ]; then + LOGFILE=${LOCALDIR}/$1 +else + LOGFILE=$(mktemp -q /tmp/freesbie.XXXXXX) +fi + . ./conf/freesbie.defaults.conf +[ -f ./conf/freesbie.conf ] && . ./conf/freesbie.conf + # XXX set $ARCH and mandatory variables here. -env +ARCH=${ARCH:-`uname -m`} + + +# XXX set common functions here + +print_error() { + echo "Something went wrong, check errors!" >&2 + [ -n "${LOGFILE:-}" ] && \ + echo "Log saved on ${LOGFILE}" >&2 +# kill $$ # XXX exit 1 won't work. + exit 1 +} +if [ -f "${LOCALDIR}/scripts/${ARCH}/${TARGET}.sh" ]; then + . ${LOCALDIR}/scripts/${ARCH}/${TARGET}.sh +elif [ -f "${LOCALDIR}/scripts/${TARGET}.sh" ]; then + . ${LOCALDIR}/scripts/${TARGET}.sh +fi